Make PLT-reduction work with gcc4, and don't include everything in
authorMatthias Clasen <mclasen@redhat.com>
Sun, 20 Mar 2005 07:01:23 +0000 (07:01 +0000)
committerMatthias Clasen <matthiasc@src.gnome.org>
Sun, 20 Mar 2005 07:01:23 +0000 (07:01 +0000)
2005-03-20  Matthias Clasen  <mclasen@redhat.com>

Make PLT-reduction work with gcc4, and don't include
everything in gdkalias.h:

* gtk/grk.symbols: Group symbols by header and source file.
* gtk/makegtkalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegtkalias.pl -def
* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
this file.
* gtk/*.c: Include gtkalias.h after the other headers,
include gtkaliasdef.c at the bottom.
* gtk/*.h: Small cleanups.

298 files changed:
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-8
gtk/Makefile.am
gtk/abicheck.sh
gtk/fnmatch.c
gtk/gtk.symbols
gtk/gtkaboutdialog.c
gtk/gtkaccelgroup.c
gtk/gtkaccellabel.c
gtk/gtkaccelmap.c
gtk/gtkaccessible.c
gtk/gtkaccessible.h
gtk/gtkaction.c
gtk/gtkactiongroup.c
gtk/gtkadjustment.c
gtk/gtkalignment.c
gtk/gtkarrow.c
gtk/gtkaspectframe.c
gtk/gtkaspectframe.h
gtk/gtkbbox.c
gtk/gtkbbox.h
gtk/gtkbin.c
gtk/gtkbin.h
gtk/gtkbindings.c
gtk/gtkbox.c
gtk/gtkbutton.c
gtk/gtkbutton.h
gtk/gtkcalendar.c
gtk/gtkcalendar.h
gtk/gtkcelleditable.c
gtk/gtkcelllayout.c
gtk/gtkcellrenderer.c
gtk/gtkcellrenderercombo.c
gtk/gtkcellrenderercombo.h
gtk/gtkcellrendererpixbuf.c
gtk/gtkcellrendererprogress.c
gtk/gtkcellrenderertext.c
gtk/gtkcellrenderertoggle.c
gtk/gtkcellview.c
gtk/gtkcheckbutton.c
gtk/gtkcheckbutton.h
gtk/gtkcheckmenuitem.c
gtk/gtkcheckmenuitem.h
gtk/gtkclipboard.c
gtk/gtkclipboard.h
gtk/gtkclist.c
gtk/gtkcolorbutton.c
gtk/gtkcolorsel.c
gtk/gtkcolorsel.h
gtk/gtkcolorseldialog.c
gtk/gtkcolorseldialog.h
gtk/gtkcombo.c
gtk/gtkcombo.h
gtk/gtkcombobox.c
gtk/gtkcomboboxentry.c
gtk/gtkcontainer.c
gtk/gtkcontainer.h
gtk/gtkctree.c
gtk/gtkctree.h
gtk/gtkcurve.c
gtk/gtkcurve.h
gtk/gtkdialog.c
gtk/gtkdialog.h
gtk/gtkdnd.c
gtk/gtkdnd.h
gtk/gtkdrawingarea.c
gtk/gtkdrawingarea.h
gtk/gtkeditable.c
gtk/gtkeditable.h
gtk/gtkentry.c
gtk/gtkentry.h
gtk/gtkentrycompletion.c
gtk/gtkeventbox.c
gtk/gtkeventbox.h
gtk/gtkexpander.c
gtk/gtkfilechooser.c
gtk/gtkfilechooserbutton.c
gtk/gtkfilechooserdefault.c
gtk/gtkfilechooserdialog.c
gtk/gtkfilechooserembed.c
gtk/gtkfilechooserentry.c
gtk/gtkfilechooserutils.c
gtk/gtkfilechooserwidget.c
gtk/gtkfilefilter.c
gtk/gtkfilesel.c
gtk/gtkfilesystem.c
gtk/gtkfilesystemmodel.c
gtk/gtkfilesystemunix.c
gtk/gtkfilesystemwin32.c
gtk/gtkfixed.c
gtk/gtkfixed.h
gtk/gtkfontbutton.c
gtk/gtkfontsel.c
gtk/gtkfontsel.h
gtk/gtkframe.c
gtk/gtkgamma.c
gtk/gtkgamma.h
gtk/gtkgc.c
gtk/gtkgc.h
gtk/gtkhandlebox.c
gtk/gtkhandlebox.h
gtk/gtkhbbox.c
gtk/gtkhbbox.h
gtk/gtkhbox.c
gtk/gtkhbox.h
gtk/gtkhpaned.c
gtk/gtkhpaned.h
gtk/gtkhruler.c
gtk/gtkhruler.h
gtk/gtkhscale.c
gtk/gtkhscale.h
gtk/gtkhscrollbar.c
gtk/gtkhseparator.c
gtk/gtkhseparator.h
gtk/gtkhsv.c
gtk/gtkhsv.h
gtk/gtkiconcache.c
gtk/gtkiconfactory.c
gtk/gtkiconfactory.h
gtk/gtkicontheme.c
gtk/gtkiconview.c
gtk/gtkimage.c
gtk/gtkimage.h
gtk/gtkimagemenuitem.c
gtk/gtkimagemenuitem.h
gtk/gtkimcontext.c
gtk/gtkimcontext.h
gtk/gtkimcontextsimple.c
gtk/gtkimmodule.c
gtk/gtkimmulticontext.c
gtk/gtkimmulticontext.h
gtk/gtkinputdialog.c
gtk/gtkinputdialog.h
gtk/gtkinvisible.c
gtk/gtkitem.c
gtk/gtkitem.h
gtk/gtkitemfactory.c
gtk/gtkitemfactory.h
gtk/gtkkeyhash.c
gtk/gtklabel.c
gtk/gtklabel.h
gtk/gtklayout.c
gtk/gtklayout.h
gtk/gtklist.c
gtk/gtklist.h
gtk/gtklistitem.c
gtk/gtkliststore.c
gtk/gtkmain.c
gtk/gtkmain.h
gtk/gtkmenu.c
gtk/gtkmenu.h
gtk/gtkmenubar.c
gtk/gtkmenuitem.c
gtk/gtkmenuitem.h
gtk/gtkmenushell.c
gtk/gtkmenushell.h
gtk/gtkmenutoolbutton.c
gtk/gtkmessagedialog.c
gtk/gtkmessagedialog.h
gtk/gtkmisc.c
gtk/gtkmisc.h
gtk/gtknotebook.c
gtk/gtknotebook.h
gtk/gtkobject.c
gtk/gtkoldeditable.c
gtk/gtkoldeditable.h
gtk/gtkoptionmenu.c
gtk/gtkoptionmenu.h
gtk/gtkpaned.c
gtk/gtkpaned.h
gtk/gtkpathbar.c
gtk/gtkpixmap.c
gtk/gtkpixmap.h
gtk/gtkplug.c
gtk/gtkplug.h
gtk/gtkpreview.c
gtk/gtkpreview.h
gtk/gtkprogress.c
gtk/gtkprogress.h
gtk/gtkprogressbar.c
gtk/gtkprogressbar.h
gtk/gtkradioaction.c
gtk/gtkradiobutton.c
gtk/gtkradiobutton.h
gtk/gtkradiomenuitem.c
gtk/gtkradiotoolbutton.c
gtk/gtkrange.c
gtk/gtkrbtree.c
gtk/gtkrc.c
gtk/gtkrc.h
gtk/gtkruler.c
gtk/gtkruler.h
gtk/gtkscale.c
gtk/gtkscale.h
gtk/gtkscrollbar.c
gtk/gtkscrollbar.h
gtk/gtkscrolledwindow.c
gtk/gtkselection.c
gtk/gtkselection.h
gtk/gtkseparator.c
gtk/gtkseparator.h
gtk/gtkseparatormenuitem.c
gtk/gtkseparatormenuitem.h
gtk/gtkseparatortoolitem.c
gtk/gtksettings.c
gtk/gtksignal.c
gtk/gtksizegroup.c
gtk/gtksizegroup.h
gtk/gtksocket.c
gtk/gtksocket.h
gtk/gtkspinbutton.c
gtk/gtkspinbutton.h
gtk/gtkstatusbar.c
gtk/gtkstatusbar.h
gtk/gtkstock.c
gtk/gtkstock.h
gtk/gtkstyle.c
gtk/gtkstyle.h
gtk/gtktable.c
gtk/gtktable.h
gtk/gtktearoffmenuitem.c
gtk/gtktearoffmenuitem.h
gtk/gtktext.c
gtk/gtktext.h
gtk/gtktextbtree.c
gtk/gtktextbtree.h
gtk/gtktextbuffer.c
gtk/gtktextbuffer.h
gtk/gtktextchild.c
gtk/gtktextchild.h
gtk/gtktextchildprivate.h
gtk/gtktextdisplay.c
gtk/gtktextdisplay.h
gtk/gtktextiter.c
gtk/gtktextiter.h
gtk/gtktextiterprivate.h
gtk/gtktextlayout.c
gtk/gtktextlayout.h
gtk/gtktextmark.c
gtk/gtktextmark.h
gtk/gtktextmarkprivate.h
gtk/gtktextsegment.c
gtk/gtktextsegment.h
gtk/gtktexttag.c
gtk/gtktexttag.h
gtk/gtktexttagprivate.h
gtk/gtktexttagtable.c
gtk/gtktexttagtable.h
gtk/gtktexttypes.c
gtk/gtktexttypes.h
gtk/gtktextutil.c
gtk/gtktextview.c
gtk/gtktextview.h
gtk/gtkthemes.c
gtk/gtkthemes.h
gtk/gtktipsquery.c
gtk/gtktipsquery.h
gtk/gtktoggleaction.c
gtk/gtktogglebutton.c
gtk/gtktogglebutton.h
gtk/gtktoggletoolbutton.c
gtk/gtktoolbar.c
gtk/gtktoolbutton.c
gtk/gtktoolitem.c
gtk/gtktooltips.c
gtk/gtktooltips.h
gtk/gtktree.c
gtk/gtktree.h
gtk/gtktreedatalist.c
gtk/gtktreednd.c
gtk/gtktreeitem.c
gtk/gtktreeitem.h
gtk/gtktreemodel.c
gtk/gtktreemodelfilter.c
gtk/gtktreemodelsort.c
gtk/gtktreeselection.c
gtk/gtktreesortable.c
gtk/gtktreestore.c
gtk/gtktreeview.c
gtk/gtktreeviewcolumn.c
gtk/gtktypeutils.c
gtk/gtkuimanager.c
gtk/gtkvbbox.c
gtk/gtkvbox.c
gtk/gtkviewport.c
gtk/gtkvpaned.c
gtk/gtkvruler.c
gtk/gtkvscale.c
gtk/gtkvscrollbar.c
gtk/gtkvseparator.c
gtk/gtkwidget.c
gtk/gtkwindow-decorate.c
gtk/gtkwindow-decorate.h
gtk/gtkwindow.c
gtk/gtkwindow.h
gtk/gtkxembed.c
gtk/makegtkalias.pl

index 8a1aab5b1f0d97a778a06b904a7eff76020fb0b0..2d5174d08cb2b4e132fd31889f3637dca8b4cf8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-03-20  Matthias Clasen  <mclasen@redhat.com>
+
+       Make PLT-reduction work with gcc4, and don't include
+       everything in gdkalias.h:
+       
+       * gtk/grk.symbols: Group symbols by header and source file.
+       * gtk/makegtkalias.pl: Protect definitions by the same 
+       preprocessor symbols used to guard the headers. Move
+       the alias declarations to a separate file which is 
+       produced when calling makegtkalias.pl -def
+       * gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate 
+       this file.
+       * gtk/*.c: Include gtkalias.h after the other headers, 
+       include gtkaliasdef.c at the bottom.
+       * gtk/*.h: Small cleanups.
+
 Fri Mar 18 23:59:49 2005  Soeren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtkmenutoolbutton.c (arrow_button_button_press_event_cb):
index 8a1aab5b1f0d97a778a06b904a7eff76020fb0b0..2d5174d08cb2b4e132fd31889f3637dca8b4cf8c 100644 (file)
@@ -1,3 +1,19 @@
+2005-03-20  Matthias Clasen  <mclasen@redhat.com>
+
+       Make PLT-reduction work with gcc4, and don't include
+       everything in gdkalias.h:
+       
+       * gtk/grk.symbols: Group symbols by header and source file.
+       * gtk/makegtkalias.pl: Protect definitions by the same 
+       preprocessor symbols used to guard the headers. Move
+       the alias declarations to a separate file which is 
+       produced when calling makegtkalias.pl -def
+       * gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate 
+       this file.
+       * gtk/*.c: Include gtkalias.h after the other headers, 
+       include gtkaliasdef.c at the bottom.
+       * gtk/*.h: Small cleanups.
+
 Fri Mar 18 23:59:49 2005  Soeren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtkmenutoolbutton.c (arrow_button_button_press_event_cb):
index 8a1aab5b1f0d97a778a06b904a7eff76020fb0b0..2d5174d08cb2b4e132fd31889f3637dca8b4cf8c 100644 (file)
@@ -1,3 +1,19 @@
+2005-03-20  Matthias Clasen  <mclasen@redhat.com>
+
+       Make PLT-reduction work with gcc4, and don't include
+       everything in gdkalias.h:
+       
+       * gtk/grk.symbols: Group symbols by header and source file.
+       * gtk/makegtkalias.pl: Protect definitions by the same 
+       preprocessor symbols used to guard the headers. Move
+       the alias declarations to a separate file which is 
+       produced when calling makegtkalias.pl -def
+       * gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate 
+       this file.
+       * gtk/*.c: Include gtkalias.h after the other headers, 
+       include gtkaliasdef.c at the bottom.
+       * gtk/*.h: Small cleanups.
+
 Fri Mar 18 23:59:49 2005  Soeren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtkmenutoolbutton.c (arrow_button_button_press_event_cb):
index 4904894ac5b3f44ea88f83e49a8552ee358772ba..a509c247a633fb4feed16adf00fceda691abc4b3 100644 (file)
@@ -75,10 +75,12 @@ uninstall-ms-lib:
 endif
 
 gtk.def: gtk.symbols
-       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/        /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/    /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
 
 gtkalias.h: gtk.symbols
          $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
+gtkaliasdef.c: gtk.symbols
+         $(PERL) $(srcdir)/makegtkalias.pl -def < $(srcdir)/gtk.symbols > gtkaliasdef.c
 
 if OS_LINUX
 TESTS = abicheck.sh
@@ -553,6 +555,7 @@ gtk_built_private_headers =                 \
        gtkmarshalers.h
 
 gtk_built_sources =                            \
+       gtkaliasdef.c                           \
        gtktypebuiltins.c                       \
        gtkmarshalers.c                         \
        gtkmarshalers.h                         \
@@ -636,7 +639,8 @@ stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
        && echo timestamp > $(@F)
 gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
        ( cd $(srcdir) && glib-mkenums \
-                       --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtkalias.h\"\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
+                       --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"\n#include \"gtkalias.h\"\n" \
+                       --ftail "#define __GTK_TYPE_BUILTINS_C__\n#include \"gtkaliasdef.c\"\n" \
                        --fprod "\n/* enumerations from \"@filename@\" */" \
                        --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
                        --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
index c426f8c318032bc9e10cefce89542e06382dfe06..e779838fc3dcedb9783fe44a1effda9bd5ec8c84 100755 (executable)
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
+cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
 nm -D .libs/libgtk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi
index aeb5ebd4222d5eac2e0f88c8bc8380ccefe90f60..677ff9f719ca796722c5fe7847922064414cf2c9 100644 (file)
@@ -41,8 +41,6 @@
 #define _GNU_SOURCE
 #endif
 
-#include "gtkalias.h"
-
 static gunichar
 get_char (const char **str)
 {
index d92ddc11f14ca7527aac73ba572c5af1ff70f84f..bed716f016cc5e799439409e264c1b33e5c61c25 100644 (file)
@@ -6,7 +6,23 @@
  * or only on Unix, or only with the X11 backend must be included in 
  * similar ifdefs, using the symbols G_OS_WIN32, G_OS_UNIX and 
  * GTK_WINDOWING_X11. 
+ * 
+ * Every symbol must be included in the right
+ * #ifdef IN_HEADER(sym) #endif and
+ * #ifdef IN_FILE(sym) #endif sections.
+ * 
+ * gdkalias.h must be included *after* all other gdk headers
+ * in each source file, gdkaliasdef.c must be included at the
+ * very bottom, after a line defining the right symbol.
  */ 
+#ifdef ALL_FILES
+#define IN_FILE(x) 1
+#define IN_HEADER(x) 1
+#endif
+
+#if IN_HEADER(__GTK_ABOUT_DIALOG_H__)
+#if IN_FILE(__GTK_ABOUT_DIALOG_C__)
+gtk_show_about_dialog G_GNUC_NULL_TERMINATED
 gtk_about_dialog_get_artists
 gtk_about_dialog_get_authors
 gtk_about_dialog_get_comments
@@ -37,13 +53,18 @@ gtk_about_dialog_set_url_hook
 gtk_about_dialog_set_version
 gtk_about_dialog_set_website
 gtk_about_dialog_set_website_label
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACCEL_GROUP_H__)
+#if IN_FILE(__GTK_ACCEL_GROUP_C__)
 gtk_accelerator_get_default_mod_mask
 gtk_accelerator_get_label
 gtk_accelerator_name
 gtk_accelerator_parse
 gtk_accelerator_set_default_mod_mask
 gtk_accelerator_valid G_GNUC_CONST
-gtk_accel_flags_get_type G_GNUC_CONST
+
 gtk_accel_group_activate
 gtk_accel_group_connect
 gtk_accel_group_connect_by_path
@@ -58,6 +79,11 @@ gtk_accel_group_query
 gtk_accel_groups_activate
 gtk_accel_groups_from_object
 gtk_accel_group_unlock
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACCEL_LABEL_H__)
+#if IN_FILE(__GTK_ACCEL_LABEL_C__)
 gtk_accel_label_get_accel_widget
 gtk_accel_label_get_accel_width
 gtk_accel_label_get_type G_GNUC_CONST
@@ -65,6 +91,11 @@ gtk_accel_label_new
 gtk_accel_label_refetch
 gtk_accel_label_set_accel_closure
 gtk_accel_label_set_accel_widget
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACCEL_MAP_H__)
+#if IN_FILE(__GTK_ACCEL_MAP_C__)
 gtk_accel_map_add_entry
 gtk_accel_map_add_filter
 gtk_accel_map_change_entry
@@ -86,8 +117,18 @@ gtk_accel_map_save_utf8
 #endif
 gtk_accel_map_save_fd
 gtk_accel_map_unlock_path
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACCESSIBLE_H__)
+#if IN_FILE(__GTK_ACCESSIBLE_C__)
 gtk_accessible_connect_widget_destroyed
 gtk_accessible_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACTION_H__)
+#if IN_FILE(__GTK_ACTION_C__)
 gtk_action_activate
 gtk_action_block_activate_from
 gtk_action_connect_accelerator
@@ -103,6 +144,19 @@ gtk_action_get_proxies
 gtk_action_get_sensitive
 gtk_action_get_type G_GNUC_CONST
 gtk_action_get_visible
+gtk_action_is_sensitive
+gtk_action_is_visible
+gtk_action_new
+gtk_action_set_accel_group
+gtk_action_set_accel_path
+gtk_action_set_sensitive
+gtk_action_set_visible
+gtk_action_unblock_activate_from
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ACTION_GROUP_H__)
+#if IN_FILE(__GTK_ACTION_GROUP_C__)
 gtk_action_group_add_action
 gtk_action_group_add_actions
 gtk_action_group_add_actions_full
@@ -124,14 +178,11 @@ gtk_action_group_set_translate_func
 gtk_action_group_set_translation_domain
 gtk_action_group_set_visible
 gtk_action_group_translate_string
-gtk_action_is_sensitive
-gtk_action_is_visible
-gtk_action_new
-gtk_action_set_accel_group
-gtk_action_set_accel_path
-gtk_action_set_sensitive
-gtk_action_set_visible
-gtk_action_unblock_activate_from
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ADJUSTMENT_H__)
+#if IN_FILE(__GTK_ADJUSTMENT_C__)
 gtk_adjustment_changed
 gtk_adjustment_clamp_page
 gtk_adjustment_get_type G_GNUC_CONST
@@ -139,25 +190,132 @@ gtk_adjustment_get_value
 gtk_adjustment_new
 gtk_adjustment_set_value
 gtk_adjustment_value_changed
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ALIGNMENT_H__)
+#if IN_FILE(__GTK_ALIGNMENT_C__)
 gtk_alignment_get_padding
 gtk_alignment_get_type G_GNUC_CONST
 gtk_alignment_new
 gtk_alignment_set
 gtk_alignment_set_padding
-gtk_alternative_dialog_button_order
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TYPE_BUILTINS_H__)
+#if IN_FILE(__GTK_TYPE_BUILTINS_C__)
+gtk_pack_direction_get_type G_GNUC_CONST
+gtk_ui_manager_item_type_get_type G_GNUC_CONST
+gtk_spin_button_update_policy_get_type G_GNUC_CONST
+gtk_notebook_tab_get_type G_GNUC_CONST
 gtk_anchor_type_get_type G_GNUC_CONST
 gtk_arg_flags_get_type G_GNUC_CONST
+gtk_arrow_type_get_type G_GNUC_CONST
+gtk_attach_options_get_type G_GNUC_CONST
+gtk_button_action_get_type G_GNUC_CONST
+gtk_buttons_type_get_type G_GNUC_CONST
+gtk_calendar_display_options_get_type G_GNUC_CONST
+gtk_cell_renderer_mode_get_type G_GNUC_CONST
+gtk_cell_renderer_state_get_type G_GNUC_CONST
+gtk_corner_type_get_type G_GNUC_CONST
+gtk_debug_flag_get_type G_GNUC_CONST
+gtk_delete_type_get_type G_GNUC_CONST
+gtk_dest_defaults_get_type G_GNUC_CONST
+gtk_clist_drag_pos_get_type G_GNUC_CONST
+gtk_dialog_flags_get_type G_GNUC_CONST
+gtk_direction_type_get_type G_GNUC_CONST
+gtk_expander_style_get_type G_GNUC_CONST
+gtk_file_chooser_action_get_type G_GNUC_CONST
+gtk_file_filter_flags_get_type G_GNUC_CONST
+gtk_window_type_get_type G_GNUC_CONST
+gtk_wrap_mode_get_type G_GNUC_CONST
+gtk_widget_flags_get_type G_GNUC_CONST
+gtk_widget_help_type_get_type G_GNUC_CONST
+gtk_window_position_get_type G_GNUC_CONST
+gtk_tree_view_column_sizing_get_type G_GNUC_CONST
+gtk_tree_view_drop_position_get_type G_GNUC_CONST
+gtk_button_box_style_get_type G_GNUC_CONST
+gtk_cell_type_get_type G_GNUC_CONST
+gtk_ctree_expander_style_get_type G_GNUC_CONST
+gtk_ctree_expansion_type_get_type G_GNUC_CONST
+gtk_ctree_line_style_get_type G_GNUC_CONST
+gtk_ctree_pos_get_type G_GNUC_CONST
+gtk_curve_type_get_type G_GNUC_CONST
+gtk_icon_lookup_flags_get_type G_GNUC_CONST
+gtk_image_type_get_type G_GNUC_CONST
+gtk_im_preedit_style_get_type G_GNUC_CONST
+gtk_im_status_style_get_type G_GNUC_CONST
+gtk_justification_get_type G_GNUC_CONST
+gtk_match_type_get_type G_GNUC_CONST
+gtk_menu_direction_type_get_type G_GNUC_CONST
+gtk_message_type_get_type G_GNUC_CONST
+gtk_metric_type_get_type G_GNUC_CONST
+gtk_movement_step_get_type G_GNUC_CONST
+gtk_orientation_get_type G_GNUC_CONST
+gtk_pack_type_get_type G_GNUC_CONST
+gtk_path_priority_type_get_type G_GNUC_CONST
+gtk_path_type_get_type G_GNUC_CONST
+gtk_policy_type_get_type G_GNUC_CONST
+gtk_position_type_get_type G_GNUC_CONST
+gtk_preview_type_get_type G_GNUC_CONST
+gtk_private_flags_get_type G_GNUC_CONST
+gtk_progress_bar_orientation_get_type G_GNUC_CONST
+gtk_progress_bar_style_get_type G_GNUC_CONST
+gtk_rc_flags_get_type G_GNUC_CONST
+gtk_rc_token_type_get_type G_GNUC_CONST
+gtk_relief_style_get_type G_GNUC_CONST
+gtk_resize_mode_get_type G_GNUC_CONST
+gtk_response_type_get_type G_GNUC_CONST
+gtk_scroll_step_get_type G_GNUC_CONST
+gtk_scroll_type_get_type G_GNUC_CONST
+gtk_selection_mode_get_type G_GNUC_CONST
+gtk_shadow_type_get_type G_GNUC_CONST
+gtk_side_type_get_type G_GNUC_CONST
+gtk_signal_run_type_get_type G_GNUC_CONST
+gtk_size_group_mode_get_type G_GNUC_CONST
+gtk_sort_type_get_type G_GNUC_CONST
+gtk_spin_type_get_type G_GNUC_CONST
+gtk_state_type_get_type G_GNUC_CONST
+gtk_submenu_direction_get_type G_GNUC_CONST
+gtk_submenu_placement_get_type G_GNUC_CONST
+gtk_target_flags_get_type G_GNUC_CONST
+gtk_text_direction_get_type G_GNUC_CONST
+gtk_text_search_flags_get_type G_GNUC_CONST
+gtk_text_window_type_get_type G_GNUC_CONST
+gtk_tree_model_flags_get_type G_GNUC_CONST
+gtk_tree_view_mode_get_type G_GNUC_CONST
+gtk_update_type_get_type G_GNUC_CONST
+gtk_visibility_get_type G_GNUC_CONST
+gtk_object_flags_get_type G_GNUC_CONST
+gtk_accel_flags_get_type G_GNUC_CONST
+gtk_icon_size_get_type G_GNUC_CONST
+gtk_file_chooser_error_get_type G_GNUC_CONST
+gtk_icon_theme_error_get_type G_GNUC_CONST
+gtk_toolbar_child_type_get_type G_GNUC_CONST
+gtk_toolbar_space_style_get_type G_GNUC_CONST
+gtk_toolbar_style_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ARROW_H__)
+#if IN_FILE(__GTK_ARROW_C__)
 gtk_arrow_get_type G_GNUC_CONST
 gtk_arrow_new
 gtk_arrow_set
-gtk_arrow_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ASPECT_FRAME_H__)
+#if IN_FILE(__GTK_ASPECT_FRAME_C__)
 gtk_aspect_frame_get_type G_GNUC_CONST
 gtk_aspect_frame_new
 gtk_aspect_frame_set
-gtk_attach_options_get_type G_GNUC_CONST
-#ifdef INCLUDE_VARIABLES
-gtk_binary_age
 #endif
+#endif
+
+#if IN_HEADER(__GTK_BINDINGS_H__)
+#if IN_FILE(__GTK_BINDINGS_C__)
 gtk_binding_entry_add_signal
 gtk_binding_entry_add_signall
 gtk_binding_entry_clear
@@ -170,11 +328,18 @@ gtk_binding_set_add_path
 gtk_binding_set_by_class
 gtk_binding_set_find
 gtk_binding_set_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_BIN_H__)
+#if IN_FILE(__GTK_BIN_C__)
 gtk_bin_get_child
 gtk_bin_get_type G_GNUC_CONST
-gtk_border_copy
-gtk_border_free
-gtk_border_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_BOX_H__)
+#if IN_FILE(__GTK_BOX_C__)
 gtk_box_get_homogeneous
 gtk_box_get_spacing
 gtk_box_get_type G_GNUC_CONST
@@ -187,17 +352,27 @@ gtk_box_reorder_child
 gtk_box_set_child_packing
 gtk_box_set_homogeneous
 gtk_box_set_spacing
-gtk_button_action_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_BUTTON_BOX_H__)
+#if IN_FILE(__GTK_BUTTON_BOX_C__)
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_button_box_set_child_size
+gtk_button_box_set_child_ipadding
 gtk_button_box_get_child_ipadding
-gtk_button_box_get_child_secondary
 gtk_button_box_get_child_size
+#endif
+gtk_button_box_get_child_secondary
 gtk_button_box_get_layout
 gtk_button_box_get_type G_GNUC_CONST
-gtk_button_box_set_child_ipadding
 gtk_button_box_set_child_secondary
-gtk_button_box_set_child_size
 gtk_button_box_set_layout
-gtk_button_box_style_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_BUTTON_H__)
+#if IN_FILE(__GTK_BUTTON_C__)
 gtk_button_clicked
 gtk_button_enter
 gtk_button_get_alignment
@@ -222,10 +397,15 @@ gtk_button_set_label
 gtk_button_set_relief
 gtk_button_set_use_stock
 gtk_button_set_use_underline
-gtk_buttons_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CALENDAR_H__)
+#if IN_FILE(__GTK_CALENDAR_C__)
 gtk_calendar_clear_marks
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_calendar_display_options
-gtk_calendar_display_options_get_type G_GNUC_CONST
+#endif
 gtk_calendar_freeze
 gtk_calendar_get_date
 gtk_calendar_get_display_options
@@ -237,10 +417,20 @@ gtk_calendar_select_month
 gtk_calendar_set_display_options
 gtk_calendar_thaw
 gtk_calendar_unmark_day
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_EDITABLE_H__)
+#if IN_FILE(__GTK_CELL_EDITABLE_C__)
 gtk_cell_editable_editing_done
 gtk_cell_editable_get_type G_GNUC_CONST
 gtk_cell_editable_remove_widget
 gtk_cell_editable_start_editing
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_LAYOUT_H__)
+#if IN_FILE(__GTK_CELL_LAYOUT_C__)
 gtk_cell_layout_add_attribute
 gtk_cell_layout_clear
 gtk_cell_layout_clear_attributes
@@ -250,33 +440,67 @@ gtk_cell_layout_pack_start
 gtk_cell_layout_reorder
 gtk_cell_layout_set_attributes G_GNUC_NULL_TERMINATED
 gtk_cell_layout_set_cell_data_func
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_C__)
 gtk_cell_renderer_activate
-gtk_cell_renderer_combo_get_type G_GNUC_CONST
-gtk_cell_renderer_combo_new
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_cell_renderer_editing_canceled
+#endif
 gtk_cell_renderer_get_fixed_size
 gtk_cell_renderer_get_size
 gtk_cell_renderer_get_type G_GNUC_CONST
-gtk_cell_renderer_mode_get_type G_GNUC_CONST
-gtk_cell_renderer_pixbuf_get_type G_GNUC_CONST
-gtk_cell_renderer_pixbuf_new
-gtk_cell_renderer_progress_get_type G_GNUC_CONST
-gtk_cell_renderer_progress_new
 gtk_cell_renderer_render
 gtk_cell_renderer_set_fixed_size
 gtk_cell_renderer_start_editing
-gtk_cell_renderer_state_get_type G_GNUC_CONST
 gtk_cell_renderer_stop_editing
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_COMBO_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_COMBO_C__)
+gtk_cell_renderer_combo_get_type G_GNUC_CONST
+gtk_cell_renderer_combo_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_PIXBUF_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_PIXBUF_C__)
+gtk_cell_renderer_pixbuf_get_type G_GNUC_CONST
+gtk_cell_renderer_pixbuf_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_PROGRESS_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_PROGRESS_C__)
+gtk_cell_renderer_progress_get_type G_GNUC_CONST
+gtk_cell_renderer_progress_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_TEXT_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_TEXT_C__)
 gtk_cell_renderer_text_get_type G_GNUC_CONST
 gtk_cell_renderer_text_new
 gtk_cell_renderer_text_set_fixed_height_from_font
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_RENDERER_TOGGLE_H__)
+#if IN_FILE(__GTK_CELL_RENDERER_TOGGLE_C__)
 gtk_cell_renderer_toggle_get_active
 gtk_cell_renderer_toggle_get_radio
 gtk_cell_renderer_toggle_get_type G_GNUC_CONST
 gtk_cell_renderer_toggle_new
 gtk_cell_renderer_toggle_set_active
 gtk_cell_renderer_toggle_set_radio
-gtk_cell_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CELL_VIEW_H__)
+#if IN_FILE(__GTK_CELL_VIEW_C__)
 gtk_cell_view_get_cell_renderers
 gtk_cell_view_get_displayed_row
 gtk_cell_view_get_size_of_row
@@ -288,10 +512,20 @@ gtk_cell_view_new_with_text
 gtk_cell_view_set_background_color
 gtk_cell_view_set_displayed_row
 gtk_cell_view_set_model
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CHECK_BUTTON_H__)
+#if IN_FILE(__GTK_CHECK_BUTTON_C__)
 gtk_check_button_get_type G_GNUC_CONST
 gtk_check_button_new
 gtk_check_button_new_with_label
 gtk_check_button_new_with_mnemonic
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_CHECK_ITEM_H__)
+#if IN_FILE(__GTK_MENU_CHECK_ITEM_C__)
 gtk_check_menu_item_get_active
 gtk_check_menu_item_get_draw_as_radio
 gtk_check_menu_item_get_inconsistent
@@ -302,9 +536,15 @@ gtk_check_menu_item_new_with_mnemonic
 gtk_check_menu_item_set_active
 gtk_check_menu_item_set_draw_as_radio
 gtk_check_menu_item_set_inconsistent
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_check_menu_item_set_show_toggle
+#endif
 gtk_check_menu_item_toggled
-gtk_check_version
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CLIPBOARD_H__)
+#if IN_FILE(__GTK_CLIPBOARD_C__)
 gtk_clipboard_clear
 gtk_clipboard_get
 gtk_clipboard_get_display
@@ -328,6 +568,12 @@ gtk_clipboard_wait_for_text
 gtk_clipboard_wait_is_image_available
 gtk_clipboard_wait_is_text_available
 gtk_clipboard_wait_is_target_available
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CLIST_H__)
+#if IN_FILE(__GTK_CLIST_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_clist_append
 gtk_clist_clear
 gtk_clist_columns_autosize
@@ -337,7 +583,6 @@ gtk_clist_column_titles_active
 gtk_clist_column_titles_hide
 gtk_clist_column_titles_passive
 gtk_clist_column_titles_show
-gtk_clist_drag_pos_get_type G_GNUC_CONST
 gtk_clist_find_row_from_data
 gtk_clist_freeze
 gtk_clist_get_cell_style
@@ -403,6 +648,12 @@ gtk_clist_thaw
 gtk_clist_undo_selection
 gtk_clist_unselect_all
 gtk_clist_unselect_row
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_COLOR_BUTTON_H__)
+#if IN_FILE(__GTK_COLOR_BUTTON_C__)
 gtk_color_button_get_alpha
 gtk_color_button_get_color
 gtk_color_button_get_title
@@ -414,9 +665,11 @@ gtk_color_button_set_alpha
 gtk_color_button_set_color
 gtk_color_button_set_title
 gtk_color_button_set_use_alpha
-gtk_color_selection_dialog_get_type G_GNUC_CONST
-gtk_color_selection_dialog_new
-gtk_color_selection_get_color
+#endif
+#endif
+
+#if IN_HEADER(__GTK_COLOR_SELECTION_H__)
+#if IN_FILE(__GTK_COLOR_SELECTION_C__)
 gtk_color_selection_get_current_alpha
 gtk_color_selection_get_current_color
 gtk_color_selection_get_has_opacity_control
@@ -428,23 +681,32 @@ gtk_color_selection_is_adjusting
 gtk_color_selection_new
 gtk_color_selection_palette_from_string
 gtk_color_selection_palette_to_string
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_color_selection_set_change_palette_hook
-gtk_color_selection_set_change_palette_with_screen_hook
 gtk_color_selection_set_color
+gtk_color_selection_get_color
+gtk_color_selection_set_update_policy
+#endif
+gtk_color_selection_set_change_palette_with_screen_hook
 gtk_color_selection_set_current_alpha
 gtk_color_selection_set_current_color
 gtk_color_selection_set_has_opacity_control
 gtk_color_selection_set_has_palette
 gtk_color_selection_set_previous_alpha
 gtk_color_selection_set_previous_color
-gtk_color_selection_set_update_policy
+#endif
+#endif
+
+#if IN_HEADER(__GTK_COLOR_SELECTION_DIALOG_H__)
+#if IN_FILE(__GTK_COLOR_SELECTION_DIALOG_C__)
+gtk_color_selection_dialog_get_type G_GNUC_CONST
+gtk_color_selection_dialog_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_COMBO_BOX_H__)
+#if IN_FILE(__GTK_COMBO_BOX_C__)
 gtk_combo_box_append_text
-gtk_combo_box_entry_get_text_column
-gtk_combo_box_entry_get_type G_GNUC_CONST
-gtk_combo_box_entry_new
-gtk_combo_box_entry_new_text
-gtk_combo_box_entry_new_with_model
-gtk_combo_box_entry_set_text_column
 gtk_combo_box_get_active
 gtk_combo_box_get_active_iter
 gtk_combo_box_get_active_text
@@ -474,6 +736,23 @@ gtk_combo_box_set_model
 gtk_combo_box_set_row_separator_func
 gtk_combo_box_set_row_span_column
 gtk_combo_box_set_wrap_width
+#endif
+#endif
+
+#if IN_HEADER(__GTK_COMBO_BOX_ENTRY_H__)
+#if IN_FILE(__GTK_COMBO_BOX_ENTRY_C__)
+gtk_combo_box_entry_get_text_column
+gtk_combo_box_entry_get_type G_GNUC_CONST
+gtk_combo_box_entry_new
+gtk_combo_box_entry_new_text
+gtk_combo_box_entry_new_with_model
+gtk_combo_box_entry_set_text_column
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SMART_COMBO_H__)
+#if IN_FILE(__GTK_SMART_COMBO_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_combo_disable_activate
 gtk_combo_get_type G_GNUC_CONST
 gtk_combo_new
@@ -483,9 +762,12 @@ gtk_combo_set_popdown_strings
 gtk_combo_set_use_arrows
 gtk_combo_set_use_arrows_always
 gtk_combo_set_value_in_list
-#ifdef INCLUDE_VARIABLES
-gtk_combo_string_key
 #endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CONTAINER_H__)
+#if IN_FILE(__GTK_CONTAINER_C__)
 gtk_container_add
 gtk_container_add_with_properties G_GNUC_NULL_TERMINATED
 gtk_container_check_resize
@@ -501,7 +783,9 @@ gtk_container_class_install_child_property
 gtk_container_class_list_child_properties
 gtk_container_forall
 gtk_container_foreach
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_container_foreach_full
+#endif
 gtk_container_get_border_width
 gtk_container_get_children
 gtk_container_get_focus_chain
@@ -520,15 +804,18 @@ gtk_container_set_focus_vadjustment
 gtk_container_set_reallocate_redraws
 gtk_container_set_resize_mode
 gtk_container_unset_focus_chain
-gtk_corner_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__C_TREE_H__)
+#if IN_FILE(__G_TREE_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_ctree_collapse
 gtk_ctree_collapse_recursive
 gtk_ctree_collapse_to_depth
 gtk_ctree_expand
-gtk_ctree_expander_style_get_type G_GNUC_CONST
 gtk_ctree_expand_recursive
 gtk_ctree_expand_to_depth
-gtk_ctree_expansion_type_get_type G_GNUC_CONST
 gtk_ctree_export_to_gnode
 gtk_ctree_find
 gtk_ctree_find_all_by_row_data
@@ -544,7 +831,6 @@ gtk_ctree_is_ancestor
 gtk_ctree_is_hot_spot
 gtk_ctree_is_viewable
 gtk_ctree_last
-gtk_ctree_line_style_get_type G_GNUC_CONST
 gtk_ctree_move
 gtk_ctree_new
 gtk_ctree_new_with_titles
@@ -571,7 +857,6 @@ gtk_ctree_node_set_row_style
 gtk_ctree_node_set_selectable
 gtk_ctree_node_set_shift
 gtk_ctree_node_set_text
-gtk_ctree_pos_get_type G_GNUC_CONST
 gtk_ctree_post_recursive
 gtk_ctree_post_recursive_to_depth
 gtk_ctree_pre_recursive
@@ -593,6 +878,12 @@ gtk_ctree_toggle_expansion
 gtk_ctree_toggle_expansion_recursive
 gtk_ctree_unselect
 gtk_ctree_unselect_recursive
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_CURVE_H__)
+#if IN_FILE(__GTK_CURVE_C__)
 gtk_curve_get_type G_GNUC_CONST
 gtk_curve_get_vector
 gtk_curve_new
@@ -601,34 +892,40 @@ gtk_curve_set_curve_type
 gtk_curve_set_gamma
 gtk_curve_set_range
 gtk_curve_set_vector
-gtk_curve_type_get_type G_GNUC_CONST
-gtk_debug_flag_get_type G_GNUC_CONST
-#ifdef INCLUDE_VARIABLES
-gtk_debug_flags
 #endif
+#endif
+
+#if IN_HEADER(__GTK_WINDOW_DECORATE_H__)
+#if IN_FILE(__GTK_WINDOW_DECORATE_C__)
 gtk_decorated_window_calculate_frame_size
 gtk_decorated_window_init
 gtk_decorated_window_move_resize_window
 gtk_decorated_window_set_title
-gtk_delete_type_get_type G_GNUC_CONST
-gtk_dest_defaults_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_DIALOG_H__)
+#if IN_FILE(__GTK_DIALOG_C__)
 gtk_dialog_add_action_widget
 gtk_dialog_add_button
 gtk_dialog_add_buttons G_GNUC_NULL_TERMINATED
-gtk_dialog_flags_get_type G_GNUC_CONST
 gtk_dialog_get_has_separator
 gtk_dialog_get_type G_GNUC_CONST
 gtk_dialog_new
 gtk_dialog_new_with_buttons G_GNUC_NULL_TERMINATED
 gtk_dialog_response
 gtk_dialog_run
+gtk_alternative_dialog_button_order
 gtk_dialog_set_alternative_button_order
 gtk_dialog_set_alternative_button_order_from_array
 gtk_dialog_set_default_response
 gtk_dialog_set_has_separator
 gtk_dialog_set_response_sensitive
-gtk_direction_type_get_type G_GNUC_CONST
-gtk_disable_setlocale
+#endif
+#endif
+
+#if IN_HEADER(__GTK_DND_H__)
+#if IN_FILE(__GTK_DND_C__)
 gtk_drag_begin
 gtk_drag_check_threshold
 gtk_drag_dest_add_image_targets
@@ -644,7 +941,9 @@ gtk_drag_finish
 gtk_drag_get_data
 gtk_drag_get_source_widget
 gtk_drag_highlight
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_drag_set_default_icon
+#endif
 gtk_drag_set_icon_default
 gtk_drag_set_icon_pixbuf
 gtk_drag_set_icon_pixmap
@@ -661,6 +960,12 @@ gtk_drag_source_set_icon_stock
 gtk_drag_source_set_target_list
 gtk_drag_source_unset
 gtk_drag_unhighlight
+#endif
+#endif
+
+#if IN_HEADER(__GTK_STYLE_H__)
+#if IN_FILE(__GTK_STYLE_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_draw_arrow
 gtk_draw_box
 gtk_draw_box_gap
@@ -672,9 +977,6 @@ gtk_draw_flat_box
 gtk_draw_focus
 gtk_draw_handle
 gtk_draw_hline
-gtk_drawing_area_get_type G_GNUC_CONST
-gtk_drawing_area_new
-gtk_drawing_area_size
 gtk_draw_insertion_cursor
 gtk_draw_layout
 gtk_draw_option
@@ -686,6 +988,59 @@ gtk_draw_slider
 gtk_draw_string
 gtk_draw_tab
 gtk_draw_vline
+gtk_style_set_font
+gtk_style_get_font
+gtk_style_ref
+gtk_style_unref
+gtk_paint_string
+#endif
+gtk_paint_arrow
+gtk_paint_box
+gtk_paint_box_gap
+gtk_paint_check
+gtk_paint_diamond
+gtk_paint_expander
+gtk_paint_extension
+gtk_paint_flat_box
+gtk_paint_focus
+gtk_paint_handle
+gtk_paint_hline
+gtk_paint_layout
+gtk_paint_option
+gtk_paint_polygon
+gtk_paint_resize_grip
+gtk_paint_shadow
+gtk_paint_shadow_gap
+gtk_paint_slider
+gtk_paint_tab
+gtk_paint_vline
+gtk_border_copy
+gtk_border_free
+gtk_border_get_type G_GNUC_CONST
+gtk_style_apply_default_background
+gtk_style_attach
+gtk_style_copy
+gtk_style_detach
+gtk_style_get_type G_GNUC_CONST
+gtk_style_lookup_icon_set
+gtk_style_new
+gtk_style_render_icon
+gtk_style_set_background
+#endif
+#endif
+
+#if IN_HEADER(__GTK_DRAWING_AREA_H__)
+#if IN_FILE(__GTK_DRAWING_AREA_C__)
+gtk_drawing_area_get_type G_GNUC_CONST
+gtk_drawing_area_new
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_drawing_area_size
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_EDITABLE_H__)
+#if IN_FILE(__GTK_EDITABLE_C__)
 gtk_editable_copy_clipboard
 gtk_editable_cut_clipboard
 gtk_editable_delete_selection
@@ -700,26 +1055,11 @@ gtk_editable_paste_clipboard
 gtk_editable_select_region
 gtk_editable_set_editable
 gtk_editable_set_position
-gtk_entry_append_text
-gtk_entry_completion_complete
-gtk_entry_completion_delete_action
-gtk_entry_completion_get_entry
-gtk_entry_completion_get_inline_completion
-gtk_entry_completion_get_minimum_key_length
-gtk_entry_completion_get_model
-gtk_entry_completion_get_popup_completion
-gtk_entry_completion_get_text_column
-gtk_entry_completion_get_type G_GNUC_CONST
-gtk_entry_completion_insert_action_markup
-gtk_entry_completion_insert_action_text
-gtk_entry_completion_insert_prefix
-gtk_entry_completion_new
-gtk_entry_completion_set_inline_completion
-gtk_entry_completion_set_match_func
-gtk_entry_completion_set_minimum_key_length
-gtk_entry_completion_set_model
-gtk_entry_completion_set_popup_completion
-gtk_entry_completion_set_text_column
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ENTRY_H__)
+#if IN_FILE(__GTK_ENTRY_C__)
 gtk_entry_get_activates_default
 gtk_entry_get_alignment
 gtk_entry_get_completion
@@ -734,29 +1074,64 @@ gtk_entry_get_visibility
 gtk_entry_get_width_chars
 gtk_entry_layout_index_to_text_index
 gtk_entry_new
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_entry_new_with_max_length
+gtk_entry_append_text
 gtk_entry_prepend_text
 gtk_entry_select_region
+gtk_entry_set_position
+gtk_entry_set_editable
+#endif
 gtk_entry_set_activates_default
 gtk_entry_set_alignment
 gtk_entry_set_completion
-gtk_entry_set_editable
 gtk_entry_set_has_frame
 gtk_entry_set_invisible_char
 gtk_entry_set_max_length
-gtk_entry_set_position
 gtk_entry_set_text
 gtk_entry_set_visibility
 gtk_entry_set_width_chars
 gtk_entry_text_index_to_layout_index
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ENTRY_COMPLETION_H__)
+#if IN_FILE(__GTK_ENTRY_COMPLETION_C__)
+gtk_entry_completion_complete
+gtk_entry_completion_delete_action
+gtk_entry_completion_get_entry
+gtk_entry_completion_get_inline_completion
+gtk_entry_completion_get_minimum_key_length
+gtk_entry_completion_get_model
+gtk_entry_completion_get_popup_completion
+gtk_entry_completion_get_text_column
+gtk_entry_completion_get_type G_GNUC_CONST
+gtk_entry_completion_insert_action_markup
+gtk_entry_completion_insert_action_text
+gtk_entry_completion_insert_prefix
+gtk_entry_completion_new
+gtk_entry_completion_set_inline_completion
+gtk_entry_completion_set_match_func
+gtk_entry_completion_set_minimum_key_length
+gtk_entry_completion_set_model
+gtk_entry_completion_set_popup_completion
+gtk_entry_completion_set_text_column
+#endif
+#endif
+
+#if IN_HEADER(__GTK_EVENT_BOX_H__)
+#if IN_FILE(__GTK_EVENT_BOX_C__)
 gtk_event_box_get_above_child
 gtk_event_box_get_type G_GNUC_CONST
 gtk_event_box_get_visible_window
 gtk_event_box_new
 gtk_event_box_set_above_child
 gtk_event_box_set_visible_window
-gtk_events_pending
-gtk_exit
+#endif
+#endif
+
+#if IN_HEADER(__GTK_EXPANDER_H__)
+#if IN_FILE(__GTK_EXPANDER_C__)
 gtk_expander_get_expanded
 gtk_expander_get_label
 gtk_expander_get_label_widget
@@ -772,27 +1147,17 @@ gtk_expander_set_label_widget
 gtk_expander_set_spacing
 gtk_expander_set_use_markup
 gtk_expander_set_use_underline
-gtk_expander_style_get_type G_GNUC_CONST
-gtk_false G_GNUC_CONST
-gtk_file_chooser_action_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_CHOOSER_H__)
+#if IN_FILE(__GTK_FILE_CHOOSER_C__)
 gtk_file_chooser_add_filter
 gtk_file_chooser_add_shortcut_folder PRIVATE
 #ifdef G_OS_WIN32
 gtk_file_chooser_add_shortcut_folder_utf8
 #endif
 gtk_file_chooser_add_shortcut_folder_uri
-gtk_file_chooser_button_get_title
-gtk_file_chooser_button_get_type G_GNUC_CONST
-gtk_file_chooser_button_get_width_chars
-gtk_file_chooser_button_new
-gtk_file_chooser_button_new_with_backend
-gtk_file_chooser_button_new_with_dialog
-gtk_file_chooser_button_set_title
-gtk_file_chooser_button_set_width_chars
-gtk_file_chooser_dialog_get_type G_GNUC_CONST
-gtk_file_chooser_dialog_new G_GNUC_NULL_TERMINATED
-gtk_file_chooser_dialog_new_with_backend G_GNUC_NULL_TERMINATED
-gtk_file_chooser_error_get_type
 gtk_file_chooser_error_quark
 gtk_file_chooser_get_action
 gtk_file_chooser_get_current_folder PRIVATE
@@ -868,20 +1233,55 @@ gtk_file_chooser_unselect_filename PRIVATE
 gtk_file_chooser_unselect_filename_utf8
 #endif
 gtk_file_chooser_unselect_uri
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_CHOOSER_DIALOG_H__)
+#if IN_FILE(__GTK_FILE_CHOOSER_DIALOG_C__)
+gtk_file_chooser_dialog_get_type G_GNUC_CONST
+gtk_file_chooser_dialog_new G_GNUC_NULL_TERMINATED
+gtk_file_chooser_dialog_new_with_backend G_GNUC_NULL_TERMINATED
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
+#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
 gtk_file_chooser_widget_get_type G_GNUC_CONST
 gtk_file_chooser_widget_new
 gtk_file_chooser_widget_new_with_backend
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_CHOOSER_BUTTON_H__)
+#if IN_FILE(__GTK_FILE_CHOOSER_BUTTON_C__)
+gtk_file_chooser_button_get_title
+gtk_file_chooser_button_get_type G_GNUC_CONST
+gtk_file_chooser_button_get_width_chars
+gtk_file_chooser_button_new
+gtk_file_chooser_button_new_with_backend
+gtk_file_chooser_button_new_with_dialog
+gtk_file_chooser_button_set_title
+gtk_file_chooser_button_set_width_chars
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_FILTER_H__)
+#if IN_FILE(__GTK_FILE_FILTER_C__)
 gtk_file_filter_add_custom
 gtk_file_filter_add_mime_type
 gtk_file_filter_add_pattern
 gtk_file_filter_add_pixbuf_formats
 gtk_file_filter_filter
-gtk_file_filter_flags_get_type G_GNUC_CONST
 gtk_file_filter_get_name
 gtk_file_filter_get_needed
 gtk_file_filter_get_type G_GNUC_CONST
 gtk_file_filter_new
 gtk_file_filter_set_name
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_SYSTEM_H__)
+#if IN_FILE(__GTK_FILE_SYSTEM_C__)
 gtk_file_folder_get_info
 gtk_file_folder_get_type G_GNUC_CONST
 gtk_file_folder_is_finished_loading
@@ -907,25 +1307,6 @@ gtk_file_path_get_type G_GNUC_CONST
 gtk_file_paths_copy
 gtk_file_paths_free
 gtk_file_paths_sort
-gtk_file_selection_complete
-gtk_file_selection_get_filename PRIVATE
-#ifdef G_OS_WIN32
-gtk_file_selection_get_filename_utf8
-#endif
-gtk_file_selection_get_selections PRIVATE
-#ifdef G_OS_WIN32
-gtk_file_selection_get_selections_utf8
-#endif
-gtk_file_selection_get_select_multiple
-gtk_file_selection_get_type G_GNUC_CONST
-gtk_file_selection_hide_fileop_buttons
-gtk_file_selection_new
-gtk_file_selection_set_filename PRIVATE
-#ifdef G_OS_WIN32
-gtk_file_selection_set_filename_utf8
-#endif
-gtk_file_selection_set_select_multiple
-gtk_file_selection_show_fileop_buttons
 gtk_file_system_create_folder
 gtk_file_system_error_quark
 gtk_file_system_filename_to_path
@@ -943,10 +1324,6 @@ gtk_file_system_path_to_filename
 gtk_file_system_path_to_uri
 gtk_file_system_remove_bookmark
 gtk_file_system_render_icon
-#ifdef G_OS_UNIX
-gtk_file_system_unix_get_type G_GNUC_CONST
-gtk_file_system_unix_new
-#endif
 gtk_file_system_uri_to_path
 gtk_file_system_volume_free
 gtk_file_system_volume_get_base_path
@@ -954,16 +1331,65 @@ gtk_file_system_volume_get_display_name
 gtk_file_system_volume_get_is_mounted
 gtk_file_system_volume_mount
 gtk_file_system_volume_render_icon
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_SYSTEM_UNIX_H__)
+#if IN_FILE(__GTK_FILE_SYSTEM_UNIX_C__)
+#ifdef G_OS_UNIX
+gtk_file_system_unix_get_type G_GNUC_CONST
+gtk_file_system_unix_new
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILE_SYSTEM_WIN32_H__)
+#if IN_FILE(__GTK_FILE_SYSTEM_WIN32_C__)
 #ifdef G_OS_WIN32
 gtk_file_system_win32_get_type G_GNUC_CONST
 gtk_file_system_win32_new
+_gtk_file_system_win32_path_compare
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FILESEL_H__)
+#if IN_FILE(__GTK_FILESEL_C__)
+gtk_file_selection_complete
+gtk_file_selection_get_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_selection_get_filename_utf8
+#endif
+gtk_file_selection_get_selections PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_selection_get_selections_utf8
+#endif
+gtk_file_selection_get_select_multiple
+gtk_file_selection_get_type G_GNUC_CONST
+gtk_file_selection_hide_fileop_buttons
+gtk_file_selection_new
+gtk_file_selection_set_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_file_selection_set_filename_utf8
+#endif
+gtk_file_selection_set_select_multiple
+gtk_file_selection_show_fileop_buttons
 #endif
+#endif
+
+#if IN_HEADER(__GTK_FIXED_H__)
+#if IN_FILE(__GTK_FIXED_C__)
 gtk_fixed_get_has_window
 gtk_fixed_get_type G_GNUC_CONST
 gtk_fixed_move
 gtk_fixed_new
 gtk_fixed_put
 gtk_fixed_set_has_window
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FONT_BUTTON_H__)
+#if IN_FILE(__GTK_FONT_BUTTON_C__)
 gtk_font_button_get_font_name
 gtk_font_button_get_show_size
 gtk_font_button_get_show_style
@@ -979,20 +1405,32 @@ gtk_font_button_set_show_style
 gtk_font_button_set_title
 gtk_font_button_set_use_font
 gtk_font_button_set_use_size
-gtk_font_selection_dialog_get_font
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FONSEL_H__)
+#if IN_FILE(__GTK_FONSEL_C__)
 gtk_font_selection_dialog_get_font_name
 gtk_font_selection_dialog_get_preview_text
 gtk_font_selection_dialog_get_type G_GNUC_CONST
 gtk_font_selection_dialog_new
 gtk_font_selection_dialog_set_font_name
 gtk_font_selection_dialog_set_preview_text
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_font_selection_get_font
+gtk_font_selection_dialog_get_font
+#endif
 gtk_font_selection_get_font_name
 gtk_font_selection_get_preview_text
 gtk_font_selection_get_type G_GNUC_CONST
 gtk_font_selection_new
 gtk_font_selection_set_font_name
 gtk_font_selection_set_preview_text
+#endif
+#endif
+
+#if IN_HEADER(__GTK_FRAME_H__)
+#if IN_FILE(__GTK_FRAME_C__)
 gtk_frame_get_label
 gtk_frame_get_label_align
 gtk_frame_get_label_widget
@@ -1003,19 +1441,25 @@ gtk_frame_set_label
 gtk_frame_set_label_align
 gtk_frame_set_label_widget
 gtk_frame_set_shadow_type
+#endif
+#endif
+
+#if IN_HEADER(__GTK_GAMMA_CURVE_H__)
+#if IN_FILE(__GTK_GAMMA_CURVE_C__)
 gtk_gamma_curve_get_type G_GNUC_CONST
 gtk_gamma_curve_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_GC_H__)
+#if IN_FILE(__GTK_GC_C__)
 gtk_gc_get
 gtk_gc_release
-gtk_get_current_event
-gtk_get_current_event_state
-gtk_get_current_event_time
-gtk_get_default_language
-gtk_get_event_widget
-gtk_get_option_group
-gtk_grab_add
-gtk_grab_get_current
-gtk_grab_remove
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HANDLE_BOX_H__)
+#if IN_FILE(__GTK_HANDLE_BOX_C__)
 gtk_handle_box_get_handle_position
 gtk_handle_box_get_shadow_type
 gtk_handle_box_get_snap_edge
@@ -1024,25 +1468,67 @@ gtk_handle_box_new
 gtk_handle_box_set_handle_position
 gtk_handle_box_set_shadow_type
 gtk_handle_box_set_snap_edge
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HBOX_H__)
+#if IN_FILE(__GTK_HBOX_C__)
 gtk_hbox_get_type G_GNUC_CONST
 gtk_hbox_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HBUTTON_BOX_H__)
+#if IN_FILE(__GTK_HBUTTON_BOX_C__)
+gtk_hbutton_box_new
+gtk_hbutton_box_get_type G_GNUC_CONST
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_hbutton_box_get_layout_default
 gtk_hbutton_box_get_spacing_default
-gtk_hbutton_box_get_type G_GNUC_CONST
-gtk_hbutton_box_new
 gtk_hbutton_box_set_layout_default
 gtk_hbutton_box_set_spacing_default
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HPANED_H__)
+#if IN_FILE(__GTK_HPANED_C__)
 gtk_hpaned_get_type G_GNUC_CONST
 gtk_hpaned_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HRULER_H__)
+#if IN_FILE(__GTK_HRULER_C__)
 gtk_hruler_get_type G_GNUC_CONST
 gtk_hruler_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HSCALE_H__)
+#if IN_FILE(__GTK_HSCALE_C__)
 gtk_hscale_get_type G_GNUC_CONST
 gtk_hscale_new
 gtk_hscale_new_with_range
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HSCROLLBAR_H__)
+#if IN_FILE(__GTK_HSCROLLBAR_C__)
 gtk_hscrollbar_get_type G_GNUC_CONST
 gtk_hscrollbar_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HSEPARATOR_H__)
+#if IN_FILE(__GTK_HSEPARATOR_C__)
 gtk_hseparator_get_type G_GNUC_CONST
 gtk_hseparator_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_HSV_H__)
+#if IN_FILE(__GTK_HSV_C__)
 gtk_hsv_get_color
 gtk_hsv_get_metrics
 gtk_hsv_get_type G_GNUC_CONST
@@ -1051,6 +1537,12 @@ gtk_hsv_new
 gtk_hsv_set_color
 gtk_hsv_set_metrics
 gtk_hsv_to_rgb
+gtk_rgb_to_hsv
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ICON_FACTORY_H__)
+#if IN_FILE(__GTK_ICON_FACTORY_C__)
 gtk_icon_factory_add
 gtk_icon_factory_add_default
 gtk_icon_factory_get_type G_GNUC_CONST
@@ -1058,21 +1550,12 @@ gtk_icon_factory_lookup
 gtk_icon_factory_lookup_default
 gtk_icon_factory_new
 gtk_icon_factory_remove_default
-gtk_icon_info_copy
-gtk_icon_info_free
-gtk_icon_info_get_attach_points
-gtk_icon_info_get_base_size
-gtk_icon_info_get_builtin_pixbuf
-gtk_icon_info_get_display_name
-gtk_icon_info_get_embedded_rect
-gtk_icon_info_get_filename PRIVATE
-#ifdef G_OS_WIN32
-gtk_icon_info_get_filename_utf8
-#endif
-gtk_icon_info_get_type G_GNUC_CONST
-gtk_icon_info_load_icon
-gtk_icon_info_set_raw_coordinates
-gtk_icon_lookup_flags_get_type G_GNUC_CONST
+gtk_icon_size_from_name
+gtk_icon_size_get_name
+gtk_icon_size_lookup
+gtk_icon_size_lookup_for_settings
+gtk_icon_size_register
+gtk_icon_size_register_alias
 gtk_icon_set_add_source
 gtk_icon_set_copy
 gtk_icon_set_get_sizes
@@ -1082,13 +1565,6 @@ gtk_icon_set_new_from_pixbuf
 gtk_icon_set_ref
 gtk_icon_set_render_icon
 gtk_icon_set_unref
-gtk_icon_size_from_name
-gtk_icon_size_get_name
-gtk_icon_size_get_type G_GNUC_CONST
-gtk_icon_size_lookup
-gtk_icon_size_lookup_for_settings
-gtk_icon_size_register
-gtk_icon_size_register_alias
 gtk_icon_source_copy
 gtk_icon_source_free
 gtk_icon_source_get_direction
@@ -1111,18 +1587,36 @@ gtk_icon_source_set_filename PRIVATE
 #ifdef G_OS_WIN32
 gtk_icon_source_set_filename_utf8
 #endif
-gtk_icon_source_set_icon_name
-gtk_icon_source_set_pixbuf
-gtk_icon_source_set_size
-gtk_icon_source_set_size_wildcarded
-gtk_icon_source_set_state
-gtk_icon_source_set_state_wildcarded
+gtk_icon_source_set_icon_name
+gtk_icon_source_set_pixbuf
+gtk_icon_source_set_size
+gtk_icon_source_set_size_wildcarded
+gtk_icon_source_set_state
+gtk_icon_source_set_state_wildcarded
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ICON_THEME_H__)
+#if IN_FILE(__GTK_ICON_THEME_C__)
+gtk_icon_info_copy
+gtk_icon_info_free
+gtk_icon_info_get_attach_points
+gtk_icon_info_get_base_size
+gtk_icon_info_get_builtin_pixbuf
+gtk_icon_info_get_display_name
+gtk_icon_info_get_embedded_rect
+gtk_icon_info_get_filename PRIVATE
+#ifdef G_OS_WIN32
+gtk_icon_info_get_filename_utf8
+#endif
+gtk_icon_info_get_type G_GNUC_CONST
+gtk_icon_info_load_icon
+gtk_icon_info_set_raw_coordinates
 gtk_icon_theme_add_builtin_icon
 gtk_icon_theme_append_search_path PRIVATE
 #ifdef G_OS_WIN32
 gtk_icon_theme_append_search_path_utf8
 #endif
-gtk_icon_theme_error_get_type
 gtk_icon_theme_error_quark
 gtk_icon_theme_get_default
 gtk_icon_theme_get_example_icon_name
@@ -1149,6 +1643,11 @@ gtk_icon_theme_set_search_path PRIVATE
 #ifdef G_OS_WIN32
 gtk_icon_theme_set_search_path_utf8
 #endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ICON_VIEW_H__)
+#if IN_FILE(__GTK_ICON_VIEW_C__)
 gtk_icon_view_get_column_spacing
 gtk_icon_view_get_columns
 gtk_icon_view_get_item_width
@@ -1185,13 +1684,15 @@ gtk_icon_view_set_spacing
 gtk_icon_view_set_text_column
 gtk_icon_view_unselect_all
 gtk_icon_view_unselect_path
-gtk_identifier_get_type G_GNUC_CONST
-gtk_idle_add
-gtk_idle_add_full
-gtk_idle_add_priority
-gtk_idle_remove
-gtk_idle_remove_by_data
+#endif
+#endif
+
+#if IN_HEADER(__GTK_IMAGE_H__)
+#if IN_FILE(__GTK_IMAGE_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_image_get
+gtk_image_set
+#endif
 gtk_image_get_animation
 gtk_image_get_icon_name
 gtk_image_get_icon_set
@@ -1202,13 +1703,6 @@ gtk_image_get_pixmap
 gtk_image_get_stock
 gtk_image_get_storage_type
 gtk_image_get_type G_GNUC_CONST
-gtk_image_menu_item_get_image
-gtk_image_menu_item_get_type G_GNUC_CONST
-gtk_image_menu_item_new
-gtk_image_menu_item_new_from_stock
-gtk_image_menu_item_new_with_label
-gtk_image_menu_item_new_with_mnemonic
-gtk_image_menu_item_set_image
 gtk_image_new
 gtk_image_new_from_animation
 gtk_image_new_from_file PRIVATE
@@ -1221,7 +1715,6 @@ gtk_image_new_from_image
 gtk_image_new_from_pixbuf
 gtk_image_new_from_pixmap
 gtk_image_new_from_stock
-gtk_image_set
 gtk_image_set_from_animation
 gtk_image_set_from_file PRIVATE
 #ifdef G_OS_WIN32
@@ -1234,7 +1727,23 @@ gtk_image_set_from_pixbuf
 gtk_image_set_from_pixmap
 gtk_image_set_from_stock
 gtk_image_set_pixel_size
-gtk_image_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_IMAGE_MENU_ITEM_H__)
+#if IN_FILE(__GTK_IMAGE_MENU_ITEM_C__)
+gtk_image_menu_item_get_image
+gtk_image_menu_item_get_type G_GNUC_CONST
+gtk_image_menu_item_new
+gtk_image_menu_item_new_from_stock
+gtk_image_menu_item_new_with_label
+gtk_image_menu_item_new_with_mnemonic
+gtk_image_menu_item_set_image
+#endif
+#endif
+
+#if IN_HEADER(__GTK_IM_CONTEXT_H__)
+#if IN_FILE(__GTK_IM_CONTEXT_C__)
 gtk_im_context_delete_surrounding
 gtk_im_context_filter_keypress
 gtk_im_context_focus_in
@@ -1247,37 +1756,47 @@ gtk_im_context_set_client_window
 gtk_im_context_set_cursor_location
 gtk_im_context_set_surrounding
 gtk_im_context_set_use_preedit
+#endif
+#endif
+
+#if IN_HEADER(__GTK_IM_CONTEXT_SIMPLE_H__)
+#if IN_FILE(__GTK_IM_CONTEXT_SIMPLE_C__)
 gtk_im_context_simple_add_table
 gtk_im_context_simple_get_type G_GNUC_CONST
 gtk_im_context_simple_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_IM_MULTICONTEXT_H__)
+#if IN_FILE(__GTK_IM_MULTICONTEXT_C__)
 gtk_im_multicontext_append_menuitems
 gtk_im_multicontext_get_type G_GNUC_CONST
 gtk_im_multicontext_new
-gtk_im_preedit_style_get_type G_GNUC_CONST
-gtk_im_status_style_get_type G_GNUC_CONST
-gtk_init
-#ifdef G_OS_WIN32
-gtk_init_abi_check
-#endif
-gtk_init_add
-gtk_init_check
-#ifdef G_OS_WIN32
-gtk_init_check_abi_check
 #endif
-gtk_init_with_args
-gtk_input_add_full
-gtk_input_dialog_get_type G_GNUC_CONST
-gtk_input_dialog_new
-gtk_input_remove
-#ifdef INCLUDE_VARIABLES
-gtk_interface_age
 #endif
+
+#if IN_HEADER(__GTK_INVISIBLE_H__)
+#if IN_FILE(__GTK_INVISIBLE_C__)
 gtk_invisible_get_screen
 gtk_invisible_get_type G_GNUC_CONST
 gtk_invisible_new
 gtk_invisible_new_for_screen
 gtk_invisible_set_screen
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ITEM_H__)
+#if IN_FILE(__GTK_ITEM_C__)
 gtk_item_deselect
+gtk_item_get_type G_GNUC_CONST
+gtk_item_select
+gtk_item_toggle
+#endif
+#endif
+
+#if IN_HEADER(__GTK_ITEM__FACTORY_H__)
+#if IN_FILE(__GTK_ITEM_FACTORY_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_item_factories_path_delete
 gtk_item_factory_add_foreign
 gtk_item_factory_construct
@@ -1302,13 +1821,16 @@ gtk_item_factory_popup_data
 gtk_item_factory_popup_data_from_widget
 gtk_item_factory_popup_with_data
 gtk_item_factory_set_translate_func
-gtk_item_get_type G_GNUC_CONST
-gtk_item_select
-gtk_item_toggle
-gtk_justification_get_type G_GNUC_CONST
-gtk_key_snooper_install
-gtk_key_snooper_remove
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_LABEL_H__)
+#if IN_FILE(__GTK_LABEL_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_label_get
+gtk_label_parse_uline
+#endif
 gtk_label_get_angle
 gtk_label_get_attributes
 gtk_label_get_ellipsize
@@ -1330,7 +1852,6 @@ gtk_label_get_use_underline
 gtk_label_get_width_chars
 gtk_label_new
 gtk_label_new_with_mnemonic
-gtk_label_parse_uline
 gtk_label_select_region
 gtk_label_set_angle
 gtk_label_set_attributes
@@ -1350,7 +1871,11 @@ gtk_label_set_text_with_mnemonic
 gtk_label_set_use_markup
 gtk_label_set_use_underline
 gtk_label_set_width_chars
-gtk_layout_freeze
+#endif
+#endif
+
+#if IN_HEADER(__GTK_LAYOUT_H__)
+#if IN_FILE(__GTK_LAYOUT_C__)
 gtk_layout_get_hadjustment
 gtk_layout_get_size
 gtk_layout_get_type G_GNUC_CONST
@@ -1361,7 +1886,15 @@ gtk_layout_put
 gtk_layout_set_hadjustment
 gtk_layout_set_size
 gtk_layout_set_vadjustment
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_layout_freeze
 gtk_layout_thaw
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_LIST_H__)
+#if IN_FILE(__GTK_LIST_C__)
 gtk_list_append_items
 gtk_list_child_position
 gtk_list_clear_items
@@ -1370,11 +1903,6 @@ gtk_list_end_selection
 gtk_list_extend_selection
 gtk_list_get_type G_GNUC_CONST
 gtk_list_insert_items
-gtk_list_item_deselect
-gtk_list_item_get_type G_GNUC_CONST
-gtk_list_item_new
-gtk_list_item_new_with_label
-gtk_list_item_select
 gtk_list_new
 gtk_list_prepend_items
 gtk_list_remove_items
@@ -1386,6 +1914,28 @@ gtk_list_select_child
 gtk_list_select_item
 gtk_list_set_selection_mode
 gtk_list_start_selection
+gtk_list_toggle_add_mode
+gtk_list_toggle_focus_row
+gtk_list_toggle_row
+gtk_list_undo_selection
+gtk_list_unselect_all
+gtk_list_unselect_child
+gtk_list_unselect_item
+#endif
+#endif
+
+#if IN_HEADER(__GTK_LIST_ITEM_H__)
+#if IN_FILE(__GTK_LIST_ITEM_C__)
+gtk_list_item_deselect
+gtk_list_item_get_type G_GNUC_CONST
+gtk_list_item_new
+gtk_list_item_new_with_label
+gtk_list_item_select
+#endif
+#endif
+
+#if IN_HEADER(__GTK_LIST_STORE_H__)
+#if IN_FILE(__GTK_LIST_STORE_C__)
 gtk_list_store_append
 gtk_list_store_clear
 gtk_list_store_get_type G_GNUC_CONST
@@ -1407,22 +1957,76 @@ gtk_list_store_set_column_types
 gtk_list_store_set_valist
 gtk_list_store_set_value
 gtk_list_store_swap
-gtk_list_toggle_add_mode
-gtk_list_toggle_focus_row
-gtk_list_toggle_row
-gtk_list_undo_selection
-gtk_list_unselect_all
-gtk_list_unselect_child
-gtk_list_unselect_item
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MAIN_H__)
+#if IN_FILE(__GTK_MAIN_C__)
+gtk_get_option_group
+gtk_get_current_event
+gtk_get_current_event_state
+gtk_get_current_event_time
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_exit
+gtk_idle_add
+gtk_idle_add_full
+gtk_idle_add_priority
+gtk_idle_remove
+gtk_idle_remove_by_data
+gtk_timeout_add
+gtk_timeout_add_full
+gtk_timeout_remove
+gtk_input_add_full
+gtk_input_remove
+#endif
+gtk_false G_GNUC_CONST
+gtk_true G_GNUC_CONST
+gtk_events_pending
+gtk_disable_setlocale
+gtk_set_locale
+gtk_check_version
+gtk_get_default_language
+gtk_get_event_widget
+gtk_grab_add
+gtk_grab_get_current
+gtk_grab_remove
+gtk_propagate_event
+gtk_quit_add
+gtk_quit_add_destroy
+gtk_quit_add_full
+gtk_quit_remove
+gtk_quit_remove_by_data
+gtk_key_snooper_install
+gtk_key_snooper_remove
+gtk_init
+#ifdef G_OS_WIN32
+gtk_init_abi_check
+#endif
+gtk_init_add
+gtk_init_check
+#ifdef G_OS_WIN32
+gtk_init_check_abi_check
+#endif
+gtk_init_with_args
+gtk_parse_args
 gtk_main
 gtk_main_do_event
 gtk_main_iteration
 gtk_main_iteration_do
 gtk_main_level
 gtk_main_quit
-#ifdef INCLUDE_VARIABLES
-gtk_major_version
 #endif
+#endif
+
+#if IN_HEADER(__GTK_INPUTDIALOG_H__)
+#if IN_FILE(__GTK_INPUTDIALOG_C__)
+gtk_input_dialog_get_type G_GNUC_CONST
+gtk_input_dialog_new
+#endif
+#endif
+
+#if IN_HEADER(__gtk_marshal_MARSHAL_H__)
+#if IN_FILE(__gtk_marshal_MARSHAL_C__)
 gtk_marshal_BOOLEAN__POINTER
 gtk_marshal_BOOLEAN__POINTER_INT_INT
 gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT
@@ -1449,17 +2053,25 @@ gtk_marshal_VOID__STRING_INT_POINTER
 gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER
 gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM
 gtk_marshal_VOID__UINT_STRING
-gtk_match_type_get_type G_GNUC_CONST
-gtk_menu_attach
-gtk_menu_attach_to_widget
-gtk_menu_bar_get_child_pack_direction
-gtk_menu_bar_get_pack_direction
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_BAR_H__)
+#if IN_FILE(__GTK_MENU_BAR_C__)
 gtk_menu_bar_get_type G_GNUC_CONST
 gtk_menu_bar_new
+gtk_menu_bar_get_child_pack_direction
 gtk_menu_bar_set_child_pack_direction
+gtk_menu_bar_get_pack_direction
 gtk_menu_bar_set_pack_direction
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_H__)
+#if IN_FILE(__GTK_MENU_C__)
+gtk_menu_attach
+gtk_menu_attach_to_widget
 gtk_menu_detach
-gtk_menu_direction_type_get_type G_GNUC_CONST
 gtk_menu_get_accel_group
 gtk_menu_get_active
 gtk_menu_get_attach_widget
@@ -1467,6 +2079,23 @@ gtk_menu_get_for_attach_widget
 gtk_menu_get_tearoff_state
 gtk_menu_get_title
 gtk_menu_get_type G_GNUC_CONST
+gtk_menu_new
+gtk_menu_popdown
+gtk_menu_popup
+gtk_menu_reorder_child
+gtk_menu_reposition
+gtk_menu_set_accel_group
+gtk_menu_set_accel_path
+gtk_menu_set_active
+gtk_menu_set_monitor
+gtk_menu_set_screen
+gtk_menu_set_tearoff_state
+gtk_menu_set_title
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_ITEM_H__)
+#if IN_FILE(__GTK_MENU_ITEM_C__)
 gtk_menu_item_activate
 gtk_menu_item_deselect
 gtk_menu_item_get_right_justified
@@ -1482,18 +2111,11 @@ gtk_menu_item_set_right_justified
 gtk_menu_item_set_submenu
 gtk_menu_item_toggle_size_allocate
 gtk_menu_item_toggle_size_request
-gtk_menu_new
-gtk_menu_popdown
-gtk_menu_popup
-gtk_menu_reorder_child
-gtk_menu_reposition
-gtk_menu_set_accel_group
-gtk_menu_set_accel_path
-gtk_menu_set_active
-gtk_menu_set_monitor
-gtk_menu_set_screen
-gtk_menu_set_tearoff_state
-gtk_menu_set_title
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_SHELL_H__)
+#if IN_FILE(__GTK_MENU_SHELL_C__)
 gtk_menu_shell_activate_item
 gtk_menu_shell_append
 gtk_menu_shell_cancel
@@ -1504,30 +2126,43 @@ gtk_menu_shell_insert
 gtk_menu_shell_prepend
 gtk_menu_shell_select_first
 gtk_menu_shell_select_item
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MENU_TOOL_BUTTON_H__)
+#if IN_FILE(__GTK_MENU_TOOL_BUTTON_C__)
 gtk_menu_tool_button_get_menu
 gtk_menu_tool_button_get_type G_GNUC_CONST
 gtk_menu_tool_button_new
 gtk_menu_tool_button_new_from_stock
 gtk_menu_tool_button_set_arrow_tooltip
 gtk_menu_tool_button_set_menu
+#endif
+#endif
+
+#if IN_HEADER(__GTK_MESSAGE_DIALOG_H__)
+#if IN_FILE(__GTK_MESSAGE_DIALOG_C__)
 gtk_message_dialog_format_secondary_markup G_GNUC_PRINTF(2,3)
 gtk_message_dialog_format_secondary_text G_GNUC_PRINTF(2,3)
 gtk_message_dialog_get_type G_GNUC_CONST
 gtk_message_dialog_new G_GNUC_PRINTF(5,6)
 gtk_message_dialog_new_with_markup G_GNUC_PRINTF(5,6)
 gtk_message_dialog_set_markup
-gtk_message_type_get_type G_GNUC_CONST
-gtk_metric_type_get_type G_GNUC_CONST
-#ifdef INCLUDE_VARIABLES
-gtk_micro_version
-gtk_minor_version
 #endif
+#endif
+
+#if IN_HEADER(__GTK_MISC_H__)
+#if IN_FILE(__GTK_MISC_C__)
 gtk_misc_get_alignment
 gtk_misc_get_padding
 gtk_misc_get_type G_GNUC_CONST
 gtk_misc_set_alignment
 gtk_misc_set_padding
-gtk_movement_step_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_NOTEBOOK_H__)
+#if IN_FILE(__GTK_NOTEBOOK_C__)
 gtk_notebook_append_page
 gtk_notebook_append_page_menu
 gtk_notebook_get_current_page
@@ -1556,47 +2191,64 @@ gtk_notebook_query_tab_label_packing
 gtk_notebook_remove_page
 gtk_notebook_reorder_child
 gtk_notebook_set_current_page
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_notebook_set_homogeneous_tabs
+gtk_notebook_set_tab_border
+gtk_notebook_set_tab_hborder
+gtk_notebook_set_tab_vborder
+#endif
 gtk_notebook_set_menu_label
 gtk_notebook_set_menu_label_text
 gtk_notebook_set_scrollable
 gtk_notebook_set_show_border
 gtk_notebook_set_show_tabs
-gtk_notebook_set_tab_border
-gtk_notebook_set_tab_hborder
 gtk_notebook_set_tab_label
 gtk_notebook_set_tab_label_packing
 gtk_notebook_set_tab_label_text
 gtk_notebook_set_tab_pos
-gtk_notebook_set_tab_vborder
-gtk_notebook_tab_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_OBJECT_H__)
+#if IN_FILE(__GTK_OBJECT_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_object_add_arg_type
-gtk_object_destroy
-gtk_object_flags_get_type G_GNUC_CONST
 gtk_object_get G_GNUC_NULL_TERMINATED
+gtk_object_set G_GNUC_NULL_TERMINATED
 gtk_object_get_data
 gtk_object_get_data_by_id
-gtk_object_get_type G_GNUC_CONST
 gtk_object_get_user_data
 gtk_object_new G_GNUC_NULL_TERMINATED
-gtk_object_ref
 gtk_object_remove_data
 gtk_object_remove_data_by_id
 gtk_object_remove_no_notify
 gtk_object_remove_no_notify_by_id
-gtk_object_set G_GNUC_NULL_TERMINATED
+gtk_object_ref
+gtk_object_unref
+gtk_object_weakref
+gtk_object_weakunref
 gtk_object_set_data
 gtk_object_set_data_by_id
 gtk_object_set_data_by_id_full
 gtk_object_set_data_full
 gtk_object_set_user_data
+#endif
+gtk_object_destroy
+gtk_object_get_type G_GNUC_CONST
 gtk_object_sink
-gtk_object_unref
-gtk_object_weakref
-gtk_object_weakunref
+#endif
+#endif
+
+#if IN_HEADER(__GTK_OLD_EDITABLE_H__)
+#if IN_FILE(__GTK_OLD_EDITABLE_C__)
 gtk_old_editable_changed
 gtk_old_editable_claim_selection
 gtk_old_editable_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_OPTION_MENU_H__)
+#if IN_FILE(__GTK_OPTION_MENU_C__)
 gtk_option_menu_get_history
 gtk_option_menu_get_menu
 gtk_option_menu_get_type G_GNUC_CONST
@@ -1604,29 +2256,11 @@ gtk_option_menu_new
 gtk_option_menu_remove_menu
 gtk_option_menu_set_history
 gtk_option_menu_set_menu
-gtk_orientation_get_type
-gtk_pack_type_get_type G_GNUC_CONST
-gtk_paint_arrow
-gtk_paint_box
-gtk_paint_box_gap
-gtk_paint_check
-gtk_paint_diamond
-gtk_paint_expander
-gtk_paint_extension
-gtk_paint_flat_box
-gtk_paint_focus
-gtk_paint_handle
-gtk_paint_hline
-gtk_paint_layout
-gtk_paint_option
-gtk_paint_polygon
-gtk_paint_resize_grip
-gtk_paint_shadow
-gtk_paint_shadow_gap
-gtk_paint_slider
-gtk_paint_string
-gtk_paint_tab
-gtk_paint_vline
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PANED_H__)
+#if IN_FILE(__GTK_PANED_C__)
 gtk_paned_add1
 gtk_paned_add2
 gtk_paned_compute_position
@@ -1637,15 +2271,27 @@ gtk_paned_get_type G_GNUC_CONST
 gtk_paned_pack1
 gtk_paned_pack2
 gtk_paned_set_position
-gtk_parse_args
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PATH_BAR_H__)
+#if IN_FILE(__GTK_PATH_BAR_C__)
 gtk_path_bar_get_type G_GNUC_CONST
-gtk_path_priority_type_get_type G_GNUC_CONST
-gtk_path_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PIXMAP_H__)
+#if IN_FILE(__GTK_PIXMAP_C__)
 gtk_pixmap_get
 gtk_pixmap_get_type G_GNUC_CONST
 gtk_pixmap_new
 gtk_pixmap_set
 gtk_pixmap_set_build_insensitive
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PLUG_H__)
+#if IN_FILE(__GTK_PLUG_C__)
 #ifdef GTK_WINDOWING_X11
 gtk_plug_construct
 gtk_plug_construct_for_display
@@ -1654,8 +2300,11 @@ gtk_plug_get_type G_GNUC_CONST
 gtk_plug_new
 gtk_plug_new_for_display
 #endif
-gtk_policy_type_get_type G_GNUC_CONST
-gtk_position_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PREVIEW_H__)
+#if IN_FILE(__GTK_PREVIEW_C__)
 gtk_preview_draw_row
 gtk_preview_get_cmap
 gtk_preview_get_info
@@ -1671,9 +2320,12 @@ gtk_preview_set_gamma
 gtk_preview_set_install_cmap
 gtk_preview_set_reserved
 gtk_preview_size
-gtk_preview_type_get_type G_GNUC_CONST
 gtk_preview_uninit
-gtk_private_flags_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PROGRESS_BAR_H__)
+#if IN_FILE(__GTK_PROGRESS_BAR_C__)
 gtk_progress_bar_get_fraction
 gtk_progress_bar_get_orientation
 gtk_progress_bar_get_pulse_step
@@ -1681,20 +2333,25 @@ gtk_progress_bar_get_text
 gtk_progress_bar_get_ellipsize
 gtk_progress_bar_get_type G_GNUC_CONST
 gtk_progress_bar_new
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_progress_bar_new_with_adjustment
-gtk_progress_bar_orientation_get_type G_GNUC_CONST
-gtk_progress_bar_pulse
-gtk_progress_bar_set_activity_blocks
-gtk_progress_bar_set_activity_step
 gtk_progress_bar_set_bar_style
 gtk_progress_bar_set_discrete_blocks
+gtk_progress_bar_set_activity_blocks
+gtk_progress_bar_set_activity_step
+gtk_progress_bar_update
+#endif
+gtk_progress_bar_pulse
 gtk_progress_bar_set_fraction
 gtk_progress_bar_set_orientation
 gtk_progress_bar_set_pulse_step
 gtk_progress_bar_set_text
 gtk_progress_bar_set_ellipsize
-gtk_progress_bar_style_get_type G_GNUC_CONST
-gtk_progress_bar_update
+#endif
+#endif
+
+#if IN_HEADER(__GTK_PROGRESS_H__)
+#if IN_FILE(__GTK_PROGRESS_C__)
 gtk_progress_configure
 gtk_progress_get_current_percentage
 gtk_progress_get_current_text
@@ -1709,17 +2366,21 @@ gtk_progress_set_percentage
 gtk_progress_set_show_text
 gtk_progress_set_text_alignment
 gtk_progress_set_value
-gtk_propagate_event
-gtk_quit_add
-gtk_quit_add_destroy
-gtk_quit_add_full
-gtk_quit_remove
-gtk_quit_remove_by_data
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RADIO_ACTION_H__)
+#if IN_FILE(__GTK_RADIO_ACTION_C__)
 gtk_radio_action_get_current_value
 gtk_radio_action_get_group
 gtk_radio_action_get_type G_GNUC_CONST
 gtk_radio_action_new
 gtk_radio_action_set_group
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RADIO_BUTTON_H__)
+#if IN_FILE(__GTK_RADIO_BUTTON_C__)
 gtk_radio_button_get_group
 gtk_radio_button_get_type G_GNUC_CONST
 gtk_radio_button_new
@@ -1729,6 +2390,11 @@ gtk_radio_button_new_with_label_from_widget
 gtk_radio_button_new_with_mnemonic
 gtk_radio_button_new_with_mnemonic_from_widget
 gtk_radio_button_set_group
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RADIO_MENU_ITEM_H__)
+#if IN_FILE(__GTK_RADIO_MENU_ITEM_C__)
 gtk_radio_menu_item_get_group
 gtk_radio_menu_item_get_type G_GNUC_CONST
 gtk_radio_menu_item_new
@@ -1738,6 +2404,11 @@ gtk_radio_menu_item_new_with_label_from_widget
 gtk_radio_menu_item_new_with_mnemonic
 gtk_radio_menu_item_new_with_mnemonic_from_widget
 gtk_radio_menu_item_set_group
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RADIO_TOOL_BUTTON_H__)
+#if IN_FILE(__GTK_RADIO_TOOL_BUTTON_C__)
 gtk_radio_tool_button_get_group
 gtk_radio_tool_button_get_type G_GNUC_CONST
 gtk_radio_tool_button_new
@@ -1745,6 +2416,11 @@ gtk_radio_tool_button_new_from_stock
 gtk_radio_tool_button_new_from_widget
 gtk_radio_tool_button_new_with_stock_from_widget
 gtk_radio_tool_button_set_group
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RANGE_H__)
+#if IN_FILE(__GTK_RANGE_C__)
 gtk_range_get_adjustment
 gtk_range_get_inverted
 gtk_range_get_type G_GNUC_CONST
@@ -1756,16 +2432,22 @@ gtk_range_set_inverted
 gtk_range_set_range
 gtk_range_set_update_policy
 gtk_range_set_value
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RC_H__)
+#if IN_FILE(__GTK_RC_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_rc_add_class_style
+gtk_rc_add_widget_class_style
+gtk_rc_add_widget_name_style
+#endif
 gtk_rc_add_default_file PRIVATE
 #ifdef G_OS_WIN32
 gtk_rc_add_default_file_utf8
 #endif
-gtk_rc_add_widget_class_style
-gtk_rc_add_widget_name_style
 gtk_rc_find_module_in_path
 gtk_rc_find_pixmap_in_path
-gtk_rc_flags_get_type G_GNUC_CONST
 gtk_rc_get_default_files
 gtk_rc_get_im_module_file
 gtk_rc_get_im_module_path
@@ -1781,11 +2463,6 @@ gtk_rc_parse_color
 gtk_rc_parse_priority
 gtk_rc_parse_state
 gtk_rc_parse_string
-gtk_rc_property_parse_border
-gtk_rc_property_parse_color
-gtk_rc_property_parse_enum
-gtk_rc_property_parse_flags
-gtk_rc_property_parse_requisition
 gtk_rc_reparse_all
 gtk_rc_reparse_all_for_settings
 gtk_rc_reset_styles
@@ -1799,14 +2476,11 @@ gtk_rc_style_get_type G_GNUC_CONST
 gtk_rc_style_new
 gtk_rc_style_ref
 gtk_rc_style_unref
-gtk_rc_token_type_get_type G_GNUC_CONST
-gtk_relief_style_get_type G_GNUC_CONST
-gtk_requisition_copy
-gtk_requisition_free
-gtk_requisition_get_type G_GNUC_CONST
-gtk_resize_mode_get_type G_GNUC_CONST
-gtk_response_type_get_type G_GNUC_CONST
-gtk_rgb_to_hsv
+#endif
+#endif
+
+#if IN_HEADER(__GTK_RULER_H__)
+#if IN_FILE(__GTK_RULER_C__)
 gtk_ruler_draw_pos
 gtk_ruler_draw_ticks
 gtk_ruler_get_metric
@@ -1814,6 +2488,11 @@ gtk_ruler_get_range
 gtk_ruler_get_type G_GNUC_CONST
 gtk_ruler_set_metric
 gtk_ruler_set_range
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SCALE_H__)
+#if IN_FILE(__GTK_SCALE_C__)
 gtk_scale_get_digits
 gtk_scale_get_draw_value
 gtk_scale_get_layout
@@ -1823,7 +2502,17 @@ gtk_scale_get_value_pos
 gtk_scale_set_digits
 gtk_scale_set_draw_value
 gtk_scale_set_value_pos
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SCROLLBAR_H__)
+#if IN_FILE(__GTK_SCROLLBAR_C__)
 gtk_scrollbar_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SCROLLED_WINDOW_H__)
+#if IN_FILE(__GTK_SCROLLED_WINDOW_C__)
 gtk_scrolled_window_add_with_viewport
 gtk_scrolled_window_get_hadjustment
 gtk_scrolled_window_get_placement
@@ -1837,8 +2526,11 @@ gtk_scrolled_window_set_placement
 gtk_scrolled_window_set_policy
 gtk_scrolled_window_set_shadow_type
 gtk_scrolled_window_set_vadjustment
-gtk_scroll_step_get_type G_GNUC_CONST
-gtk_scroll_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SELECTION_H__)
+#if IN_FILE(__GTK_SELECTION_C__)
 gtk_selection_add_target
 gtk_selection_add_targets
 gtk_selection_clear
@@ -1857,18 +2549,46 @@ gtk_selection_data_set_text
 gtk_selection_data_set_uris
 gtk_selection_data_targets_include_image
 gtk_selection_data_targets_include_text
-gtk_selection_mode_get_type G_GNUC_CONST
 gtk_selection_owner_set
 gtk_selection_owner_set_for_display
 gtk_selection_remove_all
+gtk_target_list_add
+gtk_target_list_add_image_targets
+gtk_target_list_add_table
+gtk_target_list_add_text_targets
+gtk_target_list_add_uri_targets
+gtk_target_list_find
+gtk_target_list_new
+gtk_target_list_ref
+gtk_target_list_remove
+gtk_target_list_unref
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SEPARATOR_H__)
+#if IN_FILE(__GTK_SEPARATOR_C__)
 gtk_separator_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SEPARATOR_MENU_ITEM_H__)
+#if IN_FILE(__GTK_SEPARATOR_MENU_ITEM_C__)
 gtk_separator_menu_item_get_type G_GNUC_CONST
 gtk_separator_menu_item_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SEPARATOR_TOOL_ITEM_H__)
+#if IN_FILE(__GTK_SEPARATOR_TOOL_ITEM_C__)
 gtk_separator_tool_item_get_draw
 gtk_separator_tool_item_get_type G_GNUC_CONST
 gtk_separator_tool_item_new
 gtk_separator_tool_item_set_draw
-gtk_set_locale
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SETTINGS_H__)
+#if IN_FILE(__GTK_SETTINGS_C__)
 gtk_settings_get_default
 gtk_settings_get_for_screen
 gtk_settings_get_type G_GNUC_CONST
@@ -1878,9 +2598,17 @@ gtk_settings_set_double_property
 gtk_settings_set_long_property
 gtk_settings_set_property_value
 gtk_settings_set_string_property
-gtk_shadow_type_get_type G_GNUC_CONST
-gtk_show_about_dialog G_GNUC_NULL_TERMINATED
-gtk_side_type_get_type G_GNUC_CONST
+gtk_rc_property_parse_border
+gtk_rc_property_parse_color
+gtk_rc_property_parse_enum
+gtk_rc_property_parse_flags
+gtk_rc_property_parse_requisition
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SIGNAL_H__)
+#if IN_FILE(__GTK_SIGNAL_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_signal_compat_matched
 gtk_signal_connect_full
 gtk_signal_connect_object_while_alive
@@ -1892,14 +2620,24 @@ gtk_signal_emitv
 gtk_signal_emitv_by_name
 gtk_signal_new
 gtk_signal_newv
-gtk_signal_run_type_get_type G_GNUC_CONST
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SIZE_GROUP_H__)
+#if IN_FILE(__GTK_SIZE_GROUP_C__)
 gtk_size_group_add_widget
 gtk_size_group_get_mode
 gtk_size_group_get_type G_GNUC_CONST
-gtk_size_group_mode_get_type G_GNUC_CONST
 gtk_size_group_new
 gtk_size_group_remove_widget
 gtk_size_group_set_mode
+#endif
+#endif
+
+
+#if IN_HEADER(__GTK_SOCKET_H__)
+#if IN_FILE(__GTK_SOCKET_C__)
 #ifdef GTK_WINDOWING_X11
 gtk_socket_add_id
 gtk_socket_get_id
@@ -1907,7 +2645,11 @@ gtk_socket_get_type G_GNUC_CONST
 gtk_socket_new
 gtk_socket_steal
 #endif
-gtk_sort_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_SPIN_BUTTON_H__)
+#if IN_FILE(__GTK_SPIN_BUTTON_C__)
 gtk_spin_button_configure
 gtk_spin_button_get_adjustment
 gtk_spin_button_get_digits
@@ -1933,9 +2675,11 @@ gtk_spin_button_set_value
 gtk_spin_button_set_wrap
 gtk_spin_button_spin
 gtk_spin_button_update
-gtk_spin_button_update_policy_get_type G_GNUC_CONST
-gtk_spin_type_get_type G_GNUC_CONST
-gtk_state_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_STATUSBAR_H__)
+#if IN_FILE(__GTK_STATUSBAR_C__)
 gtk_statusbar_get_context_id
 gtk_statusbar_get_has_resize_grip
 gtk_statusbar_get_type G_GNUC_CONST
@@ -1944,6 +2688,11 @@ gtk_statusbar_pop
 gtk_statusbar_push
 gtk_statusbar_remove
 gtk_statusbar_set_has_resize_grip
+#endif
+#endif
+
+#if IN_HEADER(__GTK_STOCK_H__)
+#if IN_FILE(__GTK_STOCK_C__)
 gtk_stock_add
 gtk_stock_add_static
 gtk_stock_item_copy
@@ -1951,21 +2700,11 @@ gtk_stock_item_free
 gtk_stock_list_ids
 gtk_stock_lookup
 gtk_stock_set_translate_func
-gtk_style_apply_default_background
-gtk_style_attach
-gtk_style_copy
-gtk_style_detach
-gtk_style_get_font
-gtk_style_get_type G_GNUC_CONST
-gtk_style_lookup_icon_set
-gtk_style_new
-gtk_style_ref
-gtk_style_render_icon
-gtk_style_set_background
-gtk_style_set_font
-gtk_style_unref
-gtk_submenu_direction_get_type G_GNUC_CONST
-gtk_submenu_placement_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TABLE_H__)
+#if IN_FILE(__GTK_TABLE_C__)
 gtk_table_attach
 gtk_table_attach_defaults
 gtk_table_get_col_spacing
@@ -1981,30 +2720,65 @@ gtk_table_set_col_spacings
 gtk_table_set_homogeneous
 gtk_table_set_row_spacing
 gtk_table_set_row_spacings
-gtk_target_flags_get_type G_GNUC_CONST
-gtk_target_list_add
-gtk_target_list_add_image_targets
-gtk_target_list_add_table
-gtk_target_list_add_text_targets
-gtk_target_list_add_uri_targets
-gtk_target_list_find
-gtk_target_list_new
-gtk_target_list_ref
-gtk_target_list_remove
-gtk_target_list_unref
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEAROFF_MENU_ITEM_H__)
+#if IN_FILE(__GTK_TEAROFF_MENU_ITEM_C__)
 gtk_tearoff_menu_item_get_type G_GNUC_CONST
 gtk_tearoff_menu_item_new
-gtk_text_anchored_child_set_layout
-#ifdef INCLUDE_VARIABLES
-gtk_text_attr_appearance_type
 #endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_TAG_H__)
+#if IN_FILE(__GTK_TEXT_TAG_C__)
 gtk_text_attributes_copy
 gtk_text_attributes_copy_values
 gtk_text_attributes_get_type G_GNUC_CONST
 gtk_text_attributes_new
 gtk_text_attributes_ref
 gtk_text_attributes_unref
+gtk_text_tag_event
+gtk_text_tag_get_priority
+gtk_text_tag_get_type G_GNUC_CONST
+gtk_text_tag_new
+gtk_text_tag_set_priority
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_TAG_TABLE_H__)
+#if IN_FILE(__GTK_TEXT_TAG_TABLE_C__)
+gtk_text_tag_table_add
+gtk_text_tag_table_foreach
+gtk_text_tag_table_get_size
+gtk_text_tag_table_get_type G_GNUC_CONST
+gtk_text_tag_table_lookup
+gtk_text_tag_table_new
+gtk_text_tag_table_remove
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_H__)
+#if IN_FILE(__GTK_TEXT_C__)
 gtk_text_backward_delete
+gtk_text_forward_delete
+gtk_text_freeze
+gtk_text_get_length
+gtk_text_get_point
+gtk_text_get_type G_GNUC_CONST
+gtk_text_insert
+gtk_text_new
+gtk_text_set_adjustments
+gtk_text_set_editable
+gtk_text_set_line_wrap
+gtk_text_set_point
+gtk_text_set_word_wrap
+gtk_text_thaw
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_BUFFER_H__)
+#if IN_FILE(__GTK_TEXT_BUFFER_C__)
 gtk_text_buffer_add_selection_clipboard
 gtk_text_buffer_apply_tag
 gtk_text_buffer_apply_tag_by_name
@@ -2063,27 +2837,17 @@ gtk_text_buffer_remove_tag_by_name
 gtk_text_buffer_select_range
 gtk_text_buffer_set_modified
 gtk_text_buffer_set_text
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_TYPES_H__)
+#if IN_FILE(__GTK_TEXT_TYPES_C__)
 gtk_text_byte_begins_utf8_char
-#ifdef INCLUDE_VARIABLES
-gtk_text_char_type
 #endif
-gtk_text_child_anchor_get_deleted
-gtk_text_child_anchor_get_type G_GNUC_CONST
-gtk_text_child_anchor_get_widgets
-gtk_text_child_anchor_new
-gtk_text_child_anchor_queue_resize
-gtk_text_child_anchor_register_child
-gtk_text_child_anchor_unregister_child
-#ifdef INCLUDE_VARIABLES
-gtk_text_child_type
 #endif
-gtk_text_direction_get_type G_GNUC_CONST
-gtk_text_forward_delete
-gtk_text_freeze
-gtk_text_get_length
-gtk_text_get_point
-gtk_text_get_type G_GNUC_CONST
-gtk_text_insert
+
+#if IN_HEADER(__GTK_TEXT_ITER_H__)
+#if IN_FILE(__GTK_TEXT_ITER_C__)
 gtk_text_iter_backward_char
 gtk_text_iter_backward_chars
 gtk_text_iter_backward_cursor_position
@@ -2171,10 +2935,14 @@ gtk_text_iter_starts_line
 gtk_text_iter_starts_sentence
 gtk_text_iter_starts_word
 gtk_text_iter_toggles_tag
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_LAYOUT_H__)
+#if IN_FILE(__GTK_TEXT_LAYOUT_C__)
 gtk_text_layout_changed
 gtk_text_layout_clamp_iter_to_vrange
 gtk_text_layout_default_style_changed
-gtk_text_layout_draw
 gtk_text_layout_free_line_data
 gtk_text_layout_free_line_display
 gtk_text_layout_get_buffer
@@ -2213,46 +2981,58 @@ gtk_text_layout_validate_yrange
 gtk_text_layout_wrap
 gtk_text_layout_wrap_loop_end
 gtk_text_layout_wrap_loop_start
-#ifdef INCLUDE_VARIABLES
-gtk_text_left_mark_type
 #endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_CHILD_H__)
+#if IN_FILE(__GTK_TEXT_CHILD_C__)
+gtk_text_child_anchor_get_deleted
+gtk_text_child_anchor_get_type G_GNUC_CONST
+gtk_text_child_anchor_get_widgets
+gtk_text_child_anchor_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_LAYOUT_H__)
+#if IN_FILE(__GTK_TEXT_CHILD_C__)
+gtk_text_child_anchor_queue_resize
+gtk_text_child_anchor_register_child
+gtk_text_child_anchor_unregister_child
+gtk_text_anchored_child_set_layout
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_DISPLAY_H__)
+#if IN_FILE(__GTK_TEXT_DISPLAY_C__)
+gtk_text_layout_draw
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_SEGMENT_H__)
+#if IN_FILE(__GTK_TEXT_SEGMENT_C__)
 gtk_text_line_segment_split
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_MARK_H__)
+#if IN_FILE(__GTK_TEXT_MARK_C__)
 gtk_text_mark_get_buffer
 gtk_text_mark_get_deleted
 gtk_text_mark_get_left_gravity
 gtk_text_mark_get_name
 gtk_text_mark_get_type G_GNUC_CONST
 gtk_text_mark_get_visible
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TEXT_MARK_H__)
+#if IN_FILE(__GTK_TEXT_BTREE_C__)
 gtk_text_mark_set_visible
-gtk_text_new
-#ifdef INCLUDE_VARIABLES
-gtk_text_pixbuf_type
-gtk_text_right_mark_type
 #endif
-gtk_text_search_flags_get_type G_GNUC_CONST
-gtk_text_set_adjustments
-gtk_text_set_editable
-gtk_text_set_line_wrap
-gtk_text_set_point
-gtk_text_set_word_wrap
-gtk_text_tag_event
-gtk_text_tag_get_priority
-gtk_text_tag_get_type G_GNUC_CONST
-gtk_text_tag_new
-gtk_text_tag_set_priority
-gtk_text_tag_table_add
-gtk_text_tag_table_foreach
-gtk_text_tag_table_get_size
-gtk_text_tag_table_get_type G_GNUC_CONST
-gtk_text_tag_table_lookup
-gtk_text_tag_table_new
-gtk_text_tag_table_remove
-gtk_text_thaw
-#ifdef INCLUDE_VARIABLES
-gtk_text_toggle_off_type
-gtk_text_toggle_on_type
-gtk_text_unknown_char_utf8
 #endif
+
+#if IN_HEADER(__GTK_TEXT_VIEW_H__)
+#if IN_FILE(__GTK_TEXT_VIEW_C__)
 gtk_text_view_add_child_at_anchor
 gtk_text_view_add_child_in_window
 gtk_text_view_backward_display_line
@@ -2311,19 +3091,30 @@ gtk_text_view_set_tabs
 gtk_text_view_set_wrap_mode
 gtk_text_view_starts_display_line
 gtk_text_view_window_to_buffer_coords
-gtk_text_window_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_THEMES_H__)
+#if IN_FILE(__GTK_THEMES_C__)
 gtk_theme_engine_create_rc_style
 gtk_theme_engine_get
 gtk_theme_engine_get_type G_GNUC_CONST
-gtk_timeout_add
-gtk_timeout_add_full
-gtk_timeout_remove
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TIPS_QUERY_H__)
+#if IN_FILE(__GTK_TIPS_QUERY_C__)
 gtk_tips_query_get_type G_GNUC_CONST
 gtk_tips_query_new
 gtk_tips_query_set_caller
 gtk_tips_query_set_labels
 gtk_tips_query_start_query
 gtk_tips_query_stop_query
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOGGLE_ACTION_H__)
+#if IN_FILE(__GTK_TOGGLE_ACTION_C__)
 gtk_toggle_action_get_active
 gtk_toggle_action_get_draw_as_radio
 gtk_toggle_action_get_type G_GNUC_CONST
@@ -2331,6 +3122,11 @@ gtk_toggle_action_new
 gtk_toggle_action_set_active
 gtk_toggle_action_set_draw_as_radio
 gtk_toggle_action_toggled
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOGGLE_BUTTON_H__)
+#if IN_FILE(__GTK_TOGGLE_BUTTON_C__)
 gtk_toggle_button_get_active
 gtk_toggle_button_get_inconsistent
 gtk_toggle_button_get_mode
@@ -2342,16 +3138,39 @@ gtk_toggle_button_set_active
 gtk_toggle_button_set_inconsistent
 gtk_toggle_button_set_mode
 gtk_toggle_button_toggled
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOGGLE_TOOL_BUTTON_H__)
+#if IN_FILE(__GTK_TOGGLE_TOOL_BUTTON_C__)
 gtk_toggle_tool_button_get_active
 gtk_toggle_tool_button_get_type G_GNUC_CONST
 gtk_toggle_tool_button_new
 gtk_toggle_tool_button_new_from_stock
 gtk_toggle_tool_button_set_active
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOOLBAR_H__)
+#if IN_FILE(__GTK_TOOLBAR_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_toolbar_append_element
+gtk_toolbar_set_icon_size
+gtk_toolbar_unset_icon_size
 gtk_toolbar_append_item
+gtk_toolbar_prepend_element
+gtk_toolbar_prepend_item
+gtk_toolbar_insert_element
+gtk_toolbar_insert_item
+gtk_toolbar_insert_space
+gtk_toolbar_insert_stock
 gtk_toolbar_append_space
+gtk_toolbar_prepend_space
+gtk_toolbar_remove_space
 gtk_toolbar_append_widget
-gtk_toolbar_child_type_get_type G_GNUC_CONST
+gtk_toolbar_insert_widget
+gtk_toolbar_prepend_widget
+#endif
 gtk_toolbar_get_drop_index
 gtk_toolbar_get_icon_size
 gtk_toolbar_get_item_index
@@ -2364,27 +3183,18 @@ gtk_toolbar_get_style
 gtk_toolbar_get_tooltips
 gtk_toolbar_get_type G_GNUC_CONST
 gtk_toolbar_insert
-gtk_toolbar_insert_element
-gtk_toolbar_insert_item
-gtk_toolbar_insert_space
-gtk_toolbar_insert_stock
-gtk_toolbar_insert_widget
 gtk_toolbar_new
-gtk_toolbar_prepend_element
-gtk_toolbar_prepend_item
-gtk_toolbar_prepend_space
-gtk_toolbar_prepend_widget
-gtk_toolbar_remove_space
 gtk_toolbar_set_drop_highlight_item
-gtk_toolbar_set_icon_size
 gtk_toolbar_set_orientation
 gtk_toolbar_set_show_arrow
 gtk_toolbar_set_style
 gtk_toolbar_set_tooltips
-gtk_toolbar_space_style_get_type G_GNUC_CONST
-gtk_toolbar_style_get_type G_GNUC_CONST
-gtk_toolbar_unset_icon_size
 gtk_toolbar_unset_style
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOOL_BUTTON_H__)
+#if IN_FILE(__GTK_TOOL_BUTTON_C__)
 gtk_tool_button_get_icon_widget
 gtk_tool_button_get_label
 gtk_tool_button_get_label_widget
@@ -2398,6 +3208,11 @@ gtk_tool_button_set_label
 gtk_tool_button_set_label_widget
 gtk_tool_button_set_stock_id
 gtk_tool_button_set_use_underline
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOOL_ITEM_H__)
+#if IN_FILE(__GTK_TOOL_ITEM_C__)
 gtk_tool_item_get_expand
 gtk_tool_item_get_homogeneous
 gtk_tool_item_get_icon_size
@@ -2421,6 +3236,11 @@ gtk_tool_item_set_tooltip
 gtk_tool_item_set_use_drag_window
 gtk_tool_item_set_visible_horizontal
 gtk_tool_item_set_visible_vertical
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TOOLTIPS_H__)
+#if IN_FILE(__GTK_TOOLTIPS_C__)
 gtk_tooltips_data_get
 gtk_tooltips_disable
 gtk_tooltips_enable
@@ -2428,11 +3248,36 @@ gtk_tooltips_force_window
 gtk_tooltips_get_info_from_tip_window
 gtk_tooltips_get_type G_GNUC_CONST
 gtk_tooltips_new
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_tooltips_set_delay
+#endif
 gtk_tooltips_set_tip
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_H__)
+#if IN_FILE(__GTK_TREE_C__)
 gtk_tree_append
 gtk_tree_child_position
 gtk_tree_clear_items
+gtk_tree_get_type G_GNUC_CONST
+gtk_tree_insert
+gtk_tree_prepend
+gtk_tree_remove_item
+gtk_tree_remove_items
+gtk_tree_select_child
+gtk_tree_select_item
+gtk_tree_set_selection_mode
+gtk_tree_set_view_lines
+gtk_tree_set_view_mode
+gtk_tree_unselect_child
+gtk_tree_unselect_item
+gtk_tree_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_DND_H__)
+#if IN_FILE(__GTK_TREE_DND_C__)
 gtk_tree_drag_dest_drag_data_received
 gtk_tree_drag_dest_get_type G_GNUC_CONST
 gtk_tree_drag_dest_row_drop_possible
@@ -2441,8 +3286,12 @@ gtk_tree_drag_source_drag_data_get
 gtk_tree_drag_source_get_type G_GNUC_CONST
 gtk_tree_drag_source_row_draggable
 gtk_tree_get_row_drag_data
-gtk_tree_get_type G_GNUC_CONST
-gtk_tree_insert
+gtk_tree_set_row_drag_data
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_ITEM_H__)
+#if IN_FILE(__GTK_TREE_ITEM_C__)
 gtk_tree_item_collapse
 gtk_tree_item_deselect
 gtk_tree_item_expand
@@ -2452,22 +3301,14 @@ gtk_tree_item_new_with_label
 gtk_tree_item_remove_subtree
 gtk_tree_item_select
 gtk_tree_item_set_subtree
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_MODEL_H__)
+#if IN_FILE(__GTK_TREE_MODEL_C__)
 gtk_tree_iter_copy
 gtk_tree_iter_free
 gtk_tree_iter_get_type G_GNUC_CONST
-gtk_tree_model_filter_clear_cache
-gtk_tree_model_filter_convert_child_iter_to_iter
-gtk_tree_model_filter_convert_child_path_to_path
-gtk_tree_model_filter_convert_iter_to_child_iter
-gtk_tree_model_filter_convert_path_to_child_path
-gtk_tree_model_filter_get_model
-gtk_tree_model_filter_get_type G_GNUC_CONST
-gtk_tree_model_filter_new
-gtk_tree_model_filter_refilter
-gtk_tree_model_filter_set_modify_func
-gtk_tree_model_filter_set_visible_column
-gtk_tree_model_filter_set_visible_func
-gtk_tree_model_flags_get_type G_GNUC_CONST
 gtk_tree_model_foreach
 gtk_tree_model_get
 gtk_tree_model_get_column_type
@@ -2493,18 +3334,7 @@ gtk_tree_model_row_deleted
 gtk_tree_model_row_has_child_toggled
 gtk_tree_model_row_inserted
 gtk_tree_model_rows_reordered
-gtk_tree_model_sort_clear_cache
-gtk_tree_model_sort_convert_child_iter_to_iter
-gtk_tree_model_sort_convert_child_path_to_path
-gtk_tree_model_sort_convert_iter_to_child_iter
-gtk_tree_model_sort_convert_path_to_child_path
-gtk_tree_model_sort_get_model
-gtk_tree_model_sort_get_type G_GNUC_CONST
-gtk_tree_model_sort_iter_is_valid
-gtk_tree_model_sort_new_with_model
-gtk_tree_model_sort_reset_default_sort_func
 gtk_tree_model_unref_node
-gtk_tree_new
 gtk_tree_path_append_index
 gtk_tree_path_compare
 gtk_tree_path_copy
@@ -2524,9 +3354,6 @@ gtk_tree_path_prepend_index
 gtk_tree_path_prev
 gtk_tree_path_to_string
 gtk_tree_path_up
-gtk_tree_prepend
-gtk_tree_remove_item
-gtk_tree_remove_items
 gtk_tree_row_reference_copy
 gtk_tree_row_reference_deleted
 gtk_tree_row_reference_free
@@ -2537,7 +3364,43 @@ gtk_tree_row_reference_new
 gtk_tree_row_reference_new_proxy
 gtk_tree_row_reference_reordered
 gtk_tree_row_reference_valid
-gtk_tree_select_child
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_MODEL_SORT_H__)
+#if IN_FILE(__GTK_TREE_MODEL_SORT_C__)
+gtk_tree_model_sort_clear_cache
+gtk_tree_model_sort_convert_child_iter_to_iter
+gtk_tree_model_sort_convert_child_path_to_path
+gtk_tree_model_sort_convert_iter_to_child_iter
+gtk_tree_model_sort_convert_path_to_child_path
+gtk_tree_model_sort_get_model
+gtk_tree_model_sort_get_type G_GNUC_CONST
+gtk_tree_model_sort_iter_is_valid
+gtk_tree_model_sort_new_with_model
+gtk_tree_model_sort_reset_default_sort_func
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_MODEL_FILTER_H__)
+#if IN_FILE(__GTK_TREE_MODEL_FILTER_C__)
+gtk_tree_model_filter_clear_cache
+gtk_tree_model_filter_convert_child_iter_to_iter
+gtk_tree_model_filter_convert_child_path_to_path
+gtk_tree_model_filter_convert_iter_to_child_iter
+gtk_tree_model_filter_convert_path_to_child_path
+gtk_tree_model_filter_get_model
+gtk_tree_model_filter_get_type G_GNUC_CONST
+gtk_tree_model_filter_new
+gtk_tree_model_filter_refilter
+gtk_tree_model_filter_set_modify_func
+gtk_tree_model_filter_set_visible_column
+gtk_tree_model_filter_set_visible_func
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_SELECTION_H__)
+#if IN_FILE(__GTK_TREE_SELECTION_C__)
 gtk_tree_selection_count_selected_rows
 gtk_tree_selection_get_mode
 gtk_tree_selection_get_selected
@@ -2558,11 +3421,11 @@ gtk_tree_selection_unselect_all
 gtk_tree_selection_unselect_iter
 gtk_tree_selection_unselect_path
 gtk_tree_selection_unselect_range
-gtk_tree_select_item
-gtk_tree_set_row_drag_data
-gtk_tree_set_selection_mode
-gtk_tree_set_view_lines
-gtk_tree_set_view_mode
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_SORTABLE_H__)
+#if IN_FILE(__GTK_TREE_SORTABLE_C__)
 gtk_tree_sortable_get_sort_column_id
 gtk_tree_sortable_get_type G_GNUC_CONST
 gtk_tree_sortable_has_default_sort_func
@@ -2570,6 +3433,11 @@ gtk_tree_sortable_set_default_sort_func
 gtk_tree_sortable_set_sort_column_id
 gtk_tree_sortable_set_sort_func
 gtk_tree_sortable_sort_column_changed
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_STORE_H__)
+#if IN_FILE(__GTK_TREE_STORE_C__)
 gtk_tree_store_append
 gtk_tree_store_clear
 gtk_tree_store_get_type G_GNUC_CONST
@@ -2591,11 +3459,11 @@ gtk_tree_store_set_column_types
 gtk_tree_store_set_valist
 gtk_tree_store_set_value
 gtk_tree_store_swap
-gtk_tree_unselect_child
-gtk_tree_unselect_item
-gtk_tree_view_append_column
-gtk_tree_view_collapse_all
-gtk_tree_view_collapse_row
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_VIEW_COLUMN_H__)
+#if IN_FILE(__GTK_TREE_VIEW_COLUMN_C__)
 gtk_tree_view_column_add_attribute
 gtk_tree_view_column_cell_get_position
 gtk_tree_view_column_cell_get_size
@@ -2628,7 +3496,6 @@ gtk_tree_view_column_new
 gtk_tree_view_column_new_with_attributes G_GNUC_NULL_TERMINATED
 gtk_tree_view_column_pack_end
 gtk_tree_view_column_pack_start
-gtk_tree_view_columns_autosize
 gtk_tree_view_column_set_alignment
 gtk_tree_view_column_set_attributes
 gtk_tree_view_column_set_cell_data_func
@@ -2647,9 +3514,15 @@ gtk_tree_view_column_set_spacing
 gtk_tree_view_column_set_title
 gtk_tree_view_column_set_visible
 gtk_tree_view_column_set_widget
-gtk_tree_view_column_sizing_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TREE_VIEW_H__)
+#if IN_FILE(__GTK_TREE_VIEW_C__)
+gtk_tree_view_append_column
+gtk_tree_view_collapse_all
+gtk_tree_view_collapse_row
 gtk_tree_view_create_row_drag_icon
-gtk_tree_view_drop_position_get_type G_GNUC_CONST
 gtk_tree_view_enable_model_drag_dest
 gtk_tree_view_enable_model_drag_source
 gtk_tree_view_expand_all
@@ -2685,7 +3558,6 @@ gtk_tree_view_insert_column
 gtk_tree_view_insert_column_with_attributes G_GNUC_NULL_TERMINATED
 gtk_tree_view_insert_column_with_data_func
 gtk_tree_view_map_expanded_rows
-gtk_tree_view_mode_get_type G_GNUC_CONST
 gtk_tree_view_move_column_after
 gtk_tree_view_new
 gtk_tree_view_new_with_model
@@ -2718,8 +3590,15 @@ gtk_tree_view_tree_to_widget_coords
 gtk_tree_view_unset_rows_drag_dest
 gtk_tree_view_unset_rows_drag_source
 gtk_tree_view_widget_to_tree_coords
-gtk_true G_GNUC_CONST
+gtk_tree_view_columns_autosize
+#endif
+#endif
+
+#if IN_HEADER(__GTK_TYPE_UTILS_H__)
+#if IN_FILE(__GTK_TYPE_UTILS_C__)
 gtk_type_class
+gtk_identifier_get_type G_GNUC_CONST
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_type_enum_find_value
 gtk_type_enum_get_values
 gtk_type_flags_find_value
@@ -2727,6 +3606,12 @@ gtk_type_flags_get_values
 gtk_type_init
 gtk_type_new
 gtk_type_unique
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GTK_UI_MANAGER_H__)
+#if IN_FILE(__GTK_UI_MANAGER_C__)
 gtk_ui_manager_add_ui
 gtk_ui_manager_add_ui_from_file PRIVATE
 #ifdef G_OS_WIN32
@@ -2743,21 +3628,34 @@ gtk_ui_manager_get_type G_GNUC_CONST
 gtk_ui_manager_get_ui
 gtk_ui_manager_get_widget
 gtk_ui_manager_insert_action_group
-gtk_ui_manager_item_type_get_type G_GNUC_CONST
 gtk_ui_manager_new
 gtk_ui_manager_new_merge_id
 gtk_ui_manager_remove_action_group
 gtk_ui_manager_remove_ui
 gtk_ui_manager_set_add_tearoffs
-gtk_update_type_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VBOX_H__)
+#if IN_FILE(__GTK_VBOX_C__)
 gtk_vbox_get_type G_GNUC_CONST
 gtk_vbox_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VBUTTONBOX_H__)
+#if IN_FILE(__GTK_VBUTTONBOX_C__)
 gtk_vbutton_box_get_layout_default
 gtk_vbutton_box_get_spacing_default
 gtk_vbutton_box_get_type G_GNUC_CONST
 gtk_vbutton_box_new
 gtk_vbutton_box_set_layout_default
 gtk_vbutton_box_set_spacing_default
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VIEPORT_H__)
+#if IN_FILE(__GTK_VIEPORT_C__)
 gtk_viewport_get_hadjustment
 gtk_viewport_get_shadow_type
 gtk_viewport_get_type G_GNUC_CONST
@@ -2766,18 +3664,50 @@ gtk_viewport_new
 gtk_viewport_set_hadjustment
 gtk_viewport_set_shadow_type
 gtk_viewport_set_vadjustment
-gtk_visibility_get_type G_GNUC_CONST
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VPANED_H__)
+#if IN_FILE(__GTK_VPANED_C__)
 gtk_vpaned_get_type G_GNUC_CONST
 gtk_vpaned_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VRULER_H__)
+#if IN_FILE(__GTK_VRULER_C__)
 gtk_vruler_get_type G_GNUC_CONST
 gtk_vruler_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VSCALE_H__)
+#if IN_FILE(__GTK_VSCALE_C__)
 gtk_vscale_get_type G_GNUC_CONST
 gtk_vscale_new
 gtk_vscale_new_with_range
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VSCROLLBAR_H__)
+#if IN_FILE(__GTK_VSCROLLBAR_C__)
 gtk_vscrollbar_get_type G_GNUC_CONST
 gtk_vscrollbar_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_VSEPARATOR_H__)
+#if IN_FILE(__GTK_VSEPARATOR_C__)
 gtk_vseparator_get_type G_GNUC_CONST
 gtk_vseparator_new
+#endif
+#endif
+
+#if IN_HEADER(__GTK_WIDGET_H__)
+#if IN_FILE(__GTK_WIDGET_C__)
+gtk_requisition_copy
+gtk_requisition_free
+gtk_requisition_get_type G_GNUC_CONST
 gtk_widget_activate
 gtk_widget_add_accelerator
 gtk_widget_add_events
@@ -2794,10 +3724,8 @@ gtk_widget_create_pango_context
 gtk_widget_create_pango_layout
 gtk_widget_destroy
 gtk_widget_destroyed
-gtk_widget_draw
 gtk_widget_ensure_style
 gtk_widget_event
-gtk_widget_flags_get_type G_GNUC_CONST
 gtk_widget_freeze_child_notify
 gtk_widget_get_accessible
 gtk_widget_get_ancestor
@@ -2832,7 +3760,6 @@ gtk_widget_get_visual
 gtk_widget_grab_default
 gtk_widget_grab_focus
 gtk_widget_has_screen
-gtk_widget_help_type_get_type G_GNUC_CONST
 gtk_widget_hide
 gtk_widget_hide_all
 gtk_widget_hide_on_delete
@@ -2855,8 +3782,14 @@ gtk_widget_pop_colormap
 gtk_widget_pop_composite_child
 gtk_widget_push_colormap
 gtk_widget_push_composite_child
+#ifndef GTK_DISABLE_DEPRECATED
+gtk_widget_draw
 gtk_widget_queue_clear
 gtk_widget_queue_clear_area
+gtk_widget_set
+gtk_widget_set_uposition
+gtk_widget_set_usize
+#endif
 gtk_widget_queue_draw
 gtk_widget_queue_draw_area
 gtk_widget_queue_resize
@@ -2871,7 +3804,6 @@ gtk_widget_reparent
 gtk_widget_reset_rc_styles
 gtk_widget_reset_shapes
 gtk_widget_send_expose
-gtk_widget_set G_GNUC_NULL_TERMINATED
 gtk_widget_set_accel_path
 gtk_widget_set_app_paintable
 gtk_widget_set_child_visible
@@ -2893,8 +3825,6 @@ gtk_widget_set_sensitive
 gtk_widget_set_size_request
 gtk_widget_set_state
 gtk_widget_set_style
-gtk_widget_set_uposition
-gtk_widget_set_usize
 gtk_widget_shape_combine_mask
 gtk_widget_show
 gtk_widget_show_all
@@ -2910,6 +3840,11 @@ gtk_widget_unmap
 gtk_widget_unparent
 gtk_widget_unrealize
 gtk_widget_unref
+#endif
+#endif
+
+#if IN_HEADER(__GTK_WINDOW_H__)
+#if IN_FILE(__GTK_WINDOW_C__)
 gtk_window_activate_default
 gtk_window_activate_focus
 gtk_window_activate_key
@@ -2959,7 +3894,6 @@ gtk_window_mnemonic_activate
 gtk_window_move
 gtk_window_new
 gtk_window_parse_geometry
-gtk_window_position_get_type G_GNUC_CONST
 gtk_window_present
 gtk_window_propagate_key_event
 gtk_window_remove_accel_group
@@ -2997,7 +3931,9 @@ gtk_window_set_keep_above
 gtk_window_set_keep_below
 gtk_window_set_mnemonic_modifier
 gtk_window_set_modal
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_window_set_policy
+#endif
 gtk_window_set_position
 gtk_window_set_resizable
 gtk_window_set_role
@@ -3009,11 +3945,27 @@ gtk_window_set_transient_for
 gtk_window_set_type_hint
 gtk_window_set_wmclass
 gtk_window_stick
-gtk_window_type_get_type G_GNUC_CONST
 gtk_window_unfullscreen
 gtk_window_unmaximize
 gtk_window_unstick
-gtk_wrap_mode_get_type G_GNUC_CONST
-#ifdef G_OS_WIN32
-_gtk_file_system_win32_path_compare
+#endif
+#endif
+
+#ifdef INCLUDE_VARIABLES
+gtk_binary_age
+gtk_interface_age
+gtk_major_version
+gtk_minor_version
+gtk_micro_version
+gtk_combo_string_key
+gtk_debug_flags
+gtk_text_attr_appearance_type
+gtk_text_char_type
+gtk_text_child_type
+gtk_text_left_mark_type
+gtk_text_pixbuf_type
+gtk_text_right_mark_type
+gtk_text_toggle_off_type
+gtk_text_toggle_on_type
+gtk_text_unknown_char_utf8
 #endif
index 73b41eaf9546542d2088ec2c56b4df63f0298786..72dab643fd72630dff01338123aaf737325e7765 100644 (file)
@@ -32,8 +32,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "gtkalias.h"
-
 #include "gtkaboutdialog.h"
 #include "gtkbutton.h"
 #include "gtkbbox.h"
@@ -51,6 +49,8 @@
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 
+#include "gtkalias.h"
+
 #include <string.h>
 
 typedef struct _GtkAboutDialogPrivate GtkAboutDialogPrivate;
@@ -2219,3 +2219,6 @@ gtk_show_about_dialog (GtkWindow   *parent,
   
   gtk_window_present (GTK_WINDOW (dialog));
 }
+
+#define __GTK_ABOUT_DIALOG_C__
+#include "gtkaliasdef.c"
index 128cd457a5b85f14decfd371c2cea13aaa7cf6b2..b65a7ff4594e861592eba10efbfd0d60c69f874e 100644 (file)
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "gtkalias.h"
 #include "gtkaccelgroup.h"
 #include "gtkaccellabel.h" /* For _gtk_accel_label_class_get_accelerator_label */
 #include "gtkaccelmap.h"
@@ -36,6 +35,7 @@
 #include "gtkmain.h"           /* For _gtk_boolean_handled_accumulator */
 #include "gdk/gdkkeysyms.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 
 /* --- prototypes --- */
@@ -1246,3 +1246,6 @@ gtk_accelerator_get_default_mod_mask (void)
 {
   return default_accel_mod_mask;
 }
+
+#define __GTK_ACCEL_GROUP_C__
+#include "gtkaliasdef.c"
index e70a885f1d5ba7801576763fe69bfbece498c933..0d7193c79e0b2511086ee33d1ade6d35629d02b7 100644 (file)
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkaccellabel.h"
 #include "gtkaccelmap.h"
 #include "gtkmain.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -636,3 +636,6 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
 
   return FALSE;
 }
+
+#define __GTK_ACCEL_LABEL_C__
+#include "gtkaliasdef.c"
index c4cd681dd30170df9da6e4a3e3132a6d7f833734..7b9d049ce13f8667d7436c0b1b9f63a33e5cdb5b 100644 (file)
 
 #include <config.h>
 
-#include "gtkalias.h"
 #include "gtkaccelmap.h"
 
 #include "gtkmarshalers.h"
 #include "gtkwindow.h"  /* in lack of GtkAcceleratable */
+#include "gtkalias.h"
 
 #include <glib/gstdio.h>
 
@@ -1028,3 +1028,6 @@ gtk_accel_map_save (const gchar *file_name)
 }
 
 #endif
+
+#define __GTK_ACCEL_MAP_C__
+#include "gtkaliasdef.c"
index b7295f5c7301f0c0af1fa1df2b8708cc9e543a09..c1e772ab89e0c515e5602bf09dcadc35e3393a1c 100644 (file)
@@ -20,9 +20,9 @@
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkwidget.h"
 #include "gtkaccessible.h"
+#include "gtkalias.h"
 
 static void gtk_accessible_class_init (GtkAccessibleClass *klass);
 
@@ -93,3 +93,6 @@ gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
                       &accessible->widget);
   }
 }
+
+#define __GTK_ACCESSIBLE_C__
+#include "gtkaliasdef.c"
index 853e657b19423fd4a19395859473fb58d9d10329..ca8645be6a5528600300a066d26f8dd42da518c3 100644 (file)
@@ -23,9 +23,7 @@
 #include <atk/atk.h>
 #include <gtk/gtkwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ACCESSIBLE                  (gtk_accessible_get_type ())
 #define GTK_ACCESSIBLE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessible))
@@ -69,10 +67,7 @@ GType gtk_accessible_get_type (void) G_GNUC_CONST;
 
 void gtk_accessible_connect_widget_destroyed    (GtkAccessible     *accessible);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_ACCESSIBLE_H__ */
 
index c40e7448b69f965874f508c0f46449d532c5c970..1feccf3c0789cca53991c752224d9afe1c317f39 100644 (file)
@@ -30,7 +30,6 @@
 
 #include <config.h>
 
-#include "gtkalias.h"
 #include "gtkaction.h"
 #include "gtkactiongroup.h"
 #include "gtkaccellabel.h"
@@ -45,6 +44,7 @@
 #include "gtktearoffmenuitem.h"
 #include "gtktoolbutton.h"
 #include "gtktoolbar.h"
+#include "gtkalias.h"
 
 
 #define GTK_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION, GtkActionPrivate))
@@ -1574,3 +1574,6 @@ gtk_action_disconnect_accelerator (GtkAction *action)
     gtk_accel_group_disconnect (action->private_data->accel_group,
                                action->private_data->accel_closure);
 }
+
+#define __GTK_ACTION_C__
+#include "gtkaliasdef.c"
index 30758498a6d51b0583edf74803cc51e88a463adf..bda336bc6dad9df4bec17f6801963621588e50be 100644 (file)
@@ -30,7 +30,6 @@
 
 #include <config.h>
 
-#include "gtkalias.h"
 #include "gtkactiongroup.h"
 #include "gtkstock.h"
 #include "gtktoggleaction.h"
@@ -38,6 +37,7 @@
 #include "gtkaccelmap.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define GTK_ACTION_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroupPrivate))
 
@@ -1120,3 +1120,6 @@ _gtk_action_group_emit_post_activate (GtkActionGroup *action_group,
 {
   g_signal_emit (action_group, action_group_signals[POST_ACTIVATE], 0, action);
 }
+
+#define __GTK_ACTION_GROUP_C__
+#include "gtkaliasdef.c"
index 8c2ac74d501c470bba087f8e2827d289a0258266..a257f7501e7dabc10269af97af870e89519b0030 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 enum
 {
@@ -421,3 +421,6 @@ gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
   if (need_emission)
     gtk_adjustment_value_changed (adjustment);
 }
+
+#define __GTK_ADJUSTMENT_C__
+#include "gtkaliasdef.c"
index ec633c506469ef4b60ce14ccc389eb0128c355f7..894b93d8b0f1bd03f458971703a26aa8f217f7b6 100644 (file)
@@ -25,9 +25,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkalignment.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -619,3 +619,6 @@ gtk_alignment_get_padding (GtkAlignment    *alignment,
   if(padding_right)
     *padding_right = priv->padding_right;
 }
+
+#define __GTK_ALIGNMENT_C__
+#include "gtkaliasdef.c"
index 1116e3537e9b206e6cc0189ee94afa81fdac78f1..4f3b505f5d74bc65403b529be590c02c4fe37af6 100644 (file)
@@ -26,9 +26,9 @@
 
 #include <config.h>
 #include <math.h>
-#include "gtkalias.h"
 #include "gtkarrow.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define MIN_ARROW_SIZE  15
 
@@ -288,3 +288,6 @@ gtk_arrow_expose (GtkWidget      *widget,
 
   return FALSE;
 }
+
+#define __GTK_ARROW_C__
+#include "gtkaliasdef.c"
index 454260f4812ac51ae4e7ce779dbbd8c5ed059000..7437f8f7ef484a69d1c85bf301957b0c4509fb86 100644 (file)
@@ -30,9 +30,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkaspectframe.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -335,3 +335,6 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame      *frame,
   else
     parent_class->compute_child_allocation (frame, child_allocation);
 }
+
+#define __GTK_ASPECT_FRAME_C__
+#include "gtkaliasdef.c"
index 426da7c95670c32818640d7f92775967af49d165..437be5e26ecd45ffb07385ef2c72274b14166b74 100644 (file)
 #include <gtk/gtkbin.h>
 #include <gtk/gtkframe.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ASPECT_FRAME            (gtk_aspect_frame_get_type ())
 #define GTK_ASPECT_FRAME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame))
@@ -79,9 +76,6 @@ void       gtk_aspect_frame_set        (GtkAspectFrame  *aspect_frame,
                                        gboolean         obey_child);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_ASPECT_FRAME_H__ */
index a161e7e74cfa913f09293fcf662c87c3ff49b627..a2747e9593328295a73d57d8ae63583fdf4800e7 100644 (file)
@@ -25,9 +25,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkbbox.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -503,3 +503,6 @@ _gtk_button_box_child_requisition (GtkWidget *widget,
   if (height)
     *height = needed_height;
 }
+
+#define __GTK_BUTTON_BOX_C__
+#include "gtkaliasdef.c"
index 2773b69827aac7b161de50a0a0a4bf1c623226bb..1f69197ff9b4dafca73d05183c661c6b91e324d2 100644 (file)
 #include <gtk/gtkbox.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-  
+G_BEGIN_DECLS  
 
 #define GTK_TYPE_BUTTON_BOX             (gtk_button_box_get_type ())
 #define GTK_BUTTON_BOX(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBox))
@@ -99,10 +96,7 @@ void _gtk_button_box_child_requisition (GtkWidget *widget,
                                        int       *nvis_secondaries,
                                        int       *width,
                                        int       *height);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_BUTTON_BOX_H__ */
 
index 4d8309cc3464da5484d8f242a284d742935d7c8b..a6499b3a335c16b5bb764b45490001fb28488943 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkbin.h"
+#include "gtkalias.h"
 
 
 static void gtk_bin_class_init  (GtkBinClass    *klass);
@@ -183,3 +183,6 @@ gtk_bin_get_child (GtkBin *bin)
 
   return bin->child;
 }
+
+#define __GTK_BIN_C__
+#include "gtkaliasdef.c"
index 89b61a4196f5c724cda9bd41c06b1556a02db40b..c919c1d941ffbce3807c147efae9bab8a2adc646 100644 (file)
 #include <gtk/gtkcontainer.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_BIN                  (gtk_bin_get_type ())
 #define GTK_BIN(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BIN, GtkBin))
@@ -65,9 +62,6 @@ GType      gtk_bin_get_type  (void) G_GNUC_CONST;
 
 GtkWidget *gtk_bin_get_child (GtkBin *bin);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_BIN_H__ */
index e866964c1bc8918b81a4aac88deb71b4a58a7da5..7127d4d506f18ce984e3cf61f7abf25f67ff8cdb 100644 (file)
 #include <string.h>
 #include <stdarg.h>
 #include <gdkkeysyms.h>
-#include "gtkalias.h"
 #include "gtkbindings.h"
 #include "gtkkeyhash.h"
 #include "gtkwidget.h"
 #include "gtkrc.h"
+#include "gtkalias.h"
 
 
 /* --- defines --- */
@@ -1504,3 +1504,6 @@ _gtk_binding_signal_new (const gchar          *signal_name,
  
   return signal_id;
 }
+
+#define __GTK_BINDINGS_C__
+#include "gtkaliasdef.c"
index 76f229b6c2c3dd3efba282b92ed2722011f2376e..46c6ff7f32cf28e3e6c9437749c2d511f0674f4a 100644 (file)
@@ -25,9 +25,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkbox.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -712,3 +712,6 @@ gtk_box_forall (GtkContainer *container,
        (* callback) (child->widget, callback_data);
     }
 }
+
+#define __GTK_BOX_C__
+#include "gtkaliasdef.c"
index efdbced578e358e5a2fc29a6810bf856d9699fe9..237a24971a875233dab68d73529fd5df2d029dd9 100644 (file)
@@ -26,7 +26,6 @@
 
 #include <config.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtkalignment.h"
 #include "gtkbutton.h"
 #include "gtklabel.h"
@@ -37,6 +36,7 @@
 #include "gtkstock.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define CHILD_SPACING     1
 
@@ -1787,4 +1787,5 @@ gtk_button_get_image (GtkButton *button)
   return priv->image;
 }
   
-  
+#define __GTK_BUTTON_C__
+#include "gtkaliasdef.c"  
index da940be833ca3e081c2805378cf5d708c4b57108..3537d7ba27c71deb0bac1e70393fb1149cf293ea 100644 (file)
@@ -34,9 +34,7 @@
 #include <gtk/gtkimage.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_BUTTON                 (gtk_button_get_type ())
 #define GTK_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON, GtkButton))
@@ -134,9 +132,6 @@ void _gtk_button_paint                     (GtkButton     *button,
                                            const gchar   *main_detail,
                                            const gchar   *default_detail);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_BUTTON_H__ */
index 69a3e841033a8a64501ab8e55d7b7b0a0207d994..3e740860a9051de8af08e71c190369773f1cd55b 100644 (file)
@@ -42,7 +42,6 @@
 #include <time.h>
 #include <glib/gprintf.h>
 
-#include "gtkalias.h"
 #include "gtkcalendar.h"
 #include "gtkdnd.h"
 #include "gtkintl.h"
@@ -50,6 +49,7 @@
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
 #include "gdk/gdkkeysyms.h"
+#include "gtkalias.h"
 
 /***************************************************************************/
 /* The following date routines are taken from the lib_date package.  Keep
@@ -3553,3 +3553,6 @@ gtk_calendar_drag_data_received (GtkWidget        *widget,
   gtk_calendar_select_day (calendar, day);
   g_object_thaw_notify (G_OBJECT (calendar));  
 }
+
+#define __GTK_CALENDAR_C__
+#include "gtkaliasdef.c"
index ef7143588e417484d89422ec251e84d4a6276ad4..162d814acc63a85e8d2088b182df419835d54e4e 100644 (file)
 #include <gtk/gtksignal.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_CALENDAR                  (gtk_calendar_get_type ())
 #define GTK_CALENDAR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar))
@@ -148,10 +145,6 @@ void          gtk_calendar_freeze          (GtkCalendar *calendar);
 void      gtk_calendar_thaw            (GtkCalendar *calendar);
 
 
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_CALENDAR_H__ */
index 8184d2a41754423bb66bd56995239d93d6385de8..8df33513552b05721437710ce374599939144099 100644 (file)
@@ -19,9 +19,9 @@
 
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkcelleditable.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 static void gtk_cell_editable_base_init (gpointer g_class);
 
@@ -128,3 +128,6 @@ gtk_cell_editable_remove_widget (GtkCellEditable *cell_editable)
 
   g_signal_emit_by_name (cell_editable, "remove_widget");
 }
+
+#define __GTK_CELL_EDITABLE_C__
+#include "gtkaliasdef.c"
index 7806ad4f3fef39dde7d1f9ce6c07c91c90522fc9..e402364ef0317ca5b8c64d43b4170d109a772387 100644 (file)
@@ -18,8 +18,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkcelllayout.h"
+#include "gtkalias.h"
 
 GType
 gtk_cell_layout_get_type (void)
@@ -277,3 +277,6 @@ gtk_cell_layout_reorder (GtkCellLayout   *cell_layout,
                                                         cell,
                                                         position);
 }
+
+#define __GTK_CELL_LAYOUT_C__
+#include "gtkaliasdef.c"
index b9a11813d0e455704c0dac01c38dc2acb5949b61..4c07d882e5a4fb013598e694779c8bb0f723bd4f 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkcellrenderer.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtktreeprivate.h"
+#include "gtkalias.h"
 
 static void gtk_cell_renderer_init       (GtkCellRenderer      *cell);
 static void gtk_cell_renderer_class_init (GtkCellRendererClass *class);
@@ -808,3 +808,5 @@ gtk_cell_renderer_stop_editing (GtkCellRenderer *cell,
     }
 }
 
+#define __GTK_CELL_RENDERER_C__
+#include "gtkaliasdef.c"
index ba3cb66552d6729c970e305803333de94a597ce5..96ac31a52ecaf50e5ae3b6708cad7b7782e1915a 100644 (file)
@@ -20,7 +20,6 @@
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkintl.h"
 #include "gtkbin.h"
 #include "gtkentry.h"
@@ -29,6 +28,7 @@
 #include "gtkcellrenderertext.h"
 #include "gtkcombobox.h"
 #include "gtkcomboboxentry.h"
+#include "gtkalias.h"
 
 static void gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass);
 static void gtk_cell_renderer_combo_init       (GtkCellRendererCombo      *self);
@@ -392,3 +392,6 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer     *cell,
 
   return GTK_CELL_EDITABLE (combo);
 }
+
+#define __GTK_CELL_RENDERER_COMBO_C__
+#include "gtkaliasdef.c"
index f3efe33cb107620375fdf0ed1df5c1649fb5c5f5..2c35d0965fafb74c94dc5d4c5572957532ba15ad 100644 (file)
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef GTK_CELL_RENDERER_COMBO_H
-#define GTK_CELL_RENDERER_COMBO_H
+#ifndef __GTK_CELL_RENDERER_COMBO_H__
+#define __GTK_CELL_RENDERER_COMBO_H__
 
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkcellrenderertext.h>
index 40e093eaca1848f4bdec5c3d161ce5666bac233b..e1960f9f45dc5d3c2ecf22817bf40aeebeb5613d 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#include "gtkalias.h"
 #include "gtkcellrendererpixbuf.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 static void gtk_cell_renderer_pixbuf_get_property  (GObject                    *object,
                                                    guint                       param_id,
@@ -609,3 +609,6 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer      *cell,
   if (colorized)
     g_object_unref (colorized);
 }
+
+#define __GTK_CELL_RENDERER_PIXBUF_C__
+#include "gtkaliasdef.c"
index fb9b0956f3443658130e93e221488ab2c4ea91ce..03f7cf16929b74d8a3dc1b02e369a657650667a1 100644 (file)
@@ -28,9 +28,9 @@
 #include "config.h"
 #include <stdlib.h>
 
-#include "gtkalias.h"
 #include "gtkcellrendererprogress.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define GTK_CELL_RENDERER_PROGRESS_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object),                        \
                                                                                      GTK_TYPE_CELL_RENDERER_PROGRESS, \
@@ -377,3 +377,5 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
   g_object_unref (gc);
 }
 
+#define __GTK_CELL_RENDERER_PROGRESS_C__
+#include "gtkaliasdef.c"
index 6dd4297c53d0c1d6d74632198783539100181fe2..9527604f159fa1263055e2d37726f620f55f1b70 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#include "gtkalias.h"
 #include "gtkcellrenderertext.h"
 #include "gtkeditable.h"
 #include "gtkentry.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
 #include "gtktreeprivate.h"
+#include "gtkalias.h"
 
 static void gtk_cell_renderer_text_init       (GtkCellRendererText      *celltext);
 static void gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class);
@@ -1874,3 +1874,6 @@ gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer
       renderer->calc_fixed_height = TRUE;
     }
 }
+
+#define __GTK_CELL_RENDERER_TEXT_C__
+#include "gtkaliasdef.c"
index 084d3d4afab146dd9806fabf3b6ca72b89f841c8..a0c9be559c2eb10c031a7f2ee39bdebc5f555a04 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#include "gtkalias.h"
 #include "gtkcellrenderertoggle.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtktreeprivate.h"
+#include "gtkalias.h"
 
 static void gtk_cell_renderer_toggle_get_property  (GObject                    *object,
                                                    guint                       param_id,
@@ -481,3 +481,6 @@ gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *toggle,
 
   g_object_set (toggle, "active", setting ? TRUE : FALSE, NULL);
 }
+
+#define __GTK_CELL_RENDERER_TOGGLE_C__
+#include "gtkaliasdef.c"
index 1b1d8c2c931a0b557bedb479edddb3f0a4584801..909a1b5a8ce799e8c48853927192b0feadb1348e 100644 (file)
@@ -18,7 +18,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkcellview.h"
 #include "gtkcelllayout.h"
 #include "gtkintl.h"
@@ -26,6 +25,7 @@
 #include "gtkcellrenderertext.h"
 #include "gtkcellrendererpixbuf.h"
 #include <gobject/gmarshal.h>
+#include "gtkalias.h"
 
 typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo;
 struct _GtkCellViewCellInfo
@@ -967,6 +967,18 @@ gtk_cell_view_set_displayed_row (GtkCellView *cell_view,
   gtk_widget_queue_draw (GTK_WIDGET (cell_view));
 }
 
+/**
+ * gtk_cell_view_get_displayed_row:
+ * @cell_view: a #GtkCellView
+ *
+ * Returns a #GtkTreePath referring to the currently 
+ * displayed row. If no row is currently displayed, 
+ * %NULL is returned.
+ *
+ * Returns: the currently displayed row or %NULL
+ *
+ * Since: 2.6
+ */
 GtkTreePath *
 gtk_cell_view_get_displayed_row (GtkCellView *cell_view)
 {
@@ -1085,3 +1097,6 @@ gtk_cell_view_get_cell_renderers (GtkCellView *cell_view)
 
   return g_list_reverse (retval);
 }
+
+#define __GTK_CELL_VIEW_C__
+#include "gtkaliasdef.c"
index 7c6bc801e344dbdd6edebc58c19ceeec43146f6d..04a4d01f2bfd2aa2d05cdc6a8a2f699db0c02cd7 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkcheckbutton.h"
 #include "gtkintl.h"
 #include "gtklabel.h"
+#include "gtkalias.h"
 
 
 #define INDICATOR_SIZE     13
@@ -451,3 +451,6 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
                       x, y, indicator_size, indicator_size);
     }
 }
+
+#define __GTK_CHECK_BUTTON_C__
+#include "gtkaliasdef.c"
index b2f3e1eaef1325683a9bef22a33deea2d76e2288..106bf5463d29fe3e354e5e1648861eac690186c0 100644 (file)
 #include <gtk/gtktogglebutton.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_CHECK_BUTTON                  (gtk_check_button_get_type ())
 #define GTK_CHECK_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_BUTTON, GtkCheckButton))
@@ -77,9 +74,6 @@ void _gtk_check_button_get_props (GtkCheckButton *check_button,
                                  gint           *indicator_size,
                                  gint           *indicator_spacing);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_CHECK_BUTTON_H__ */
index 5a3e9884fc9d4a9a698daf00c581f1da17147554..9f78ccee0aff8d596ad8e19aab8e93d4725c84bb 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkcheckmenuitem.h"
 #include "gtkaccellabel.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 enum {
   TOGGLED,
@@ -541,3 +541,6 @@ gtk_check_menu_item_set_property (GObject      *object,
       break;
     }
 }
+
+#define __GTK_CHECK_MENU_ITEM_C__
+#include "gtkaliasdef.c"
index 74b1ef133eb2f806ea5368feb1f2a72d7f5a3930..6db552fc614c4099f70dc1482ef013a5eb9e3f32 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GTK_MENU_CHECK_ITEM_H__
-#define __GTK_MENU_CHECK_ITEM_H__
+#ifndef __GTK_CHECK_MENU_ITEM_H__
+#define __GTK_CHECK_MENU_ITEM_H__
 
 
 #include <gdk/gdk.h>
 #include <gtk/gtkmenuitem.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_CHECK_MENU_ITEM            (gtk_check_menu_item_get_type ())
 #define GTK_CHECK_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem))
@@ -97,9 +94,6 @@ void     gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
 #define        gtk_check_menu_item_set_state           gtk_check_menu_item_set_active
 #endif
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_CHECK_MENU_ITEM_H__ */
index a570b74c9d37bfeee75f42c0a7cb3ac591ed73ab..bb21b009c7c426e5fe5f7b787eff63d91bb08a94 100644 (file)
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkclipboard.h"
 #include "gtkinvisible.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
@@ -1731,3 +1731,6 @@ _gtk_clipboard_store_all (void)
   g_slist_free (displays);
   
 }
+
+#define __GTK_CLIPBOARD_C__
+#include "gtkaliasdef.c"
index dee672fa5562fe440fb2b8990c102627e6fcb2b0..9be35a63602b16494bf2e5bf1c0a27f5050b6b85 100644 (file)
 #ifndef __GTK_CLIPBOARD_H__
 #define __GTK_CLIPBOARD_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <gtk/gtkselection.h>
 
+G_BEGIN_DECLS
+
 #define GTK_TYPE_CLIPBOARD            (gtk_clipboard_get_type ())
 #define GTK_CLIPBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard))
 #define GTK_IS_CLIPBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD))
@@ -127,8 +125,6 @@ void     _gtk_clipboard_handle_event    (GdkEventOwnerChange *event);
 
 void     _gtk_clipboard_store_all       (void);
   
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_CLIPBOARD_H__ */
index eabeb5a45df8cd6fc77b54cd170a9e615982ce5d..ad77731cf415710462873c3c5977846a4ce1dd44 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkmain.h"
+#include "gtkobject.h"
 #include "gtkclist.h"
 #include "gtkbindings.h"
 #include "gtkdnd.h"
 #include "gtkmarshalers.h"
 #include <gdk/gdkkeysyms.h>
+#include "gtkalias.h"
 
 /* length of button_actions array */
 #define MAX_BUTTON 5
@@ -7825,3 +7826,7 @@ gtk_clist_set_button_actions (GtkCList *clist,
       clist->button_actions[button] = button_actions;
     }
 }
+
+#define __GTK_CLIST_C__
+#include "gtkaliasdef.c"
+
index 65a26146842423fd582dd9352b1534ded74b9cee..f096962fb42d4ccd1cd7d248e610c81d09d73e38 100644 (file)
@@ -30,7 +30,6 @@
 
 #include <config.h>
 
-#include "gtkalias.h"
 #include "gtkcolorbutton.h"
 #include "gdk/gdkkeysyms.h"
 #include "gdk-pixbuf/gdk-pixbuf.h"
@@ -45,6 +44,7 @@
 #include "gtksignal.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 /* Size of checks and gray levels for alpha compositing checkerboard */
 #define CHECK_SIZE  4
@@ -1009,3 +1009,6 @@ gtk_color_button_get_property (GObject    *object,
       break;
     }
 }
+
+#define __GTK_COLOR_BUTTON_C__
+#include "gtkaliasdef.c"
index 7c6375bd977066b1173ecf8631a67c714aa9903a..119073838cac0fb04517a26f8bfebd8017bb3301 100644 (file)
@@ -29,7 +29,6 @@
 #include "gdkconfig.h"
 #include <math.h>
 
-#include "gtkalias.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkcolorsel.h"
 #include "gtkhsv.h"
@@ -60,6 +59,7 @@
 #include "gtkimage.h"
 #include "gtkstock.h"
 #include "gtkaccessible.h"
+#include "gtkalias.h"
 
 #include <string.h>
 
@@ -2865,3 +2865,7 @@ make_all_relations (AtkObject *atk_obj,
   make_control_relations (atk_obj, priv->green_spinbutton);
   make_control_relations (atk_obj, priv->blue_spinbutton);
 }
+
+#define __GTK_COLOR_SELECTION_C__
+#include "gtkaliasdef.c"
+
index dbdddf6166b3e5a5326fb21ad6f93b4ab9ee6fae..8cfc3c931abd8c2069aef1c64ad1a6300504cc7c 100644 (file)
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkvbox.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_COLOR_SELECTION                       (gtk_color_selection_get_type ())
 #define GTK_COLOR_SELECTION(obj)                       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelection))
@@ -128,9 +125,6 @@ void gtk_color_selection_set_update_policy (GtkColorSelection *colorsel,
                                            GtkUpdateType      policy);
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_COLOR_SELECTION_H__ */
index 84b97de3fd1ba50f45f3599d16a51eae4515ab2f..5591bc02bc56cde691e87c73f2c2e14cdb731d03 100644 (file)
  */
 #include <config.h>
 #include <glib.h>
-#include "gtkalias.h"
 #include "gtkcolorseldialog.h"
 #include "gtkframe.h"
 #include "gtkhbbox.h"
 #include "gtkbutton.h"
 #include "gtkstock.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 static void gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass);
@@ -138,3 +138,5 @@ gtk_color_selection_dialog_new (const gchar *title)
   return GTK_WIDGET (colorseldiag);
 }
 
+#define __GTK_COLOR_SELECTION_DIALOG_C__
+#include "gtkaliasdef.c"
index 6a1c657de30ac34d7ab0872cff75611df5a90c2b..7ad02491173d814594ae95dbb52dbf47d77d0224 100644 (file)
@@ -30,9 +30,7 @@
 #include <gtk/gtkcolorsel.h>
 #include <gtk/gtkvbox.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_COLOR_SELECTION_DIALOG            (gtk_color_selection_dialog_get_type ())
 #define GTK_COLOR_SELECTION_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialog))
@@ -73,9 +71,6 @@ GType      gtk_color_selection_dialog_get_type (void) G_GNUC_CONST;
 GtkWidget* gtk_color_selection_dialog_new      (const gchar *title); 
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_COLOR_SELECTION_DIALOG_H__ */
index 51ed736d31eeadd27783676ae5c00912bc7add6c..e62d6018ee99461de0db6ab71859785c90d90395 100644 (file)
@@ -33,7 +33,6 @@
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkarrow.h"
 #include "gtklabel.h"
 #include "gtklist.h"
@@ -48,6 +47,7 @@
 #include "gtkcombo.h"
 #include "gtkframe.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 const gchar gtk_combo_string_key[] = "gtk-combo-string-value";
 
@@ -1254,3 +1254,6 @@ gtk_combo_get_property (GObject         *object,
     }
    
 }
+
+#define __GTK_SMART_COMBO_C__
+#include "gtkaliasdef.c"
index 9652dc274144341248ea44b2455f13416a4e2d79..31655af3a432991e84f49dca73b373ef4786b88d 100644 (file)
@@ -32,9 +32,7 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkitem.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_COMBO              (gtk_combo_get_type ())
 #define GTK_COMBO(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO, GtkCombo))
@@ -113,9 +111,7 @@ void       gtk_combo_set_popdown_strings   (GtkCombo*    combo,
 
 void       gtk_combo_disable_activate      (GtkCombo*    combo);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_SMART_COMBO_H__ */
 
index c1ac9332bd4870a2bd4ebc7f2146b09146f1cd2f..5a9a8b7b1241bae1935ff7b2e3bc32b125e0c878 100644 (file)
@@ -18,7 +18,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkcombobox.h"
 
 #include "gtkarrow.h"
@@ -51,6 +50,7 @@
 #include "gtkintl.h"
 
 #include "gtktreeprivate.h"
+#include "gtkalias.h"
 
 /* WELCOME, to THE house of evil code */
 
@@ -5140,3 +5140,6 @@ gtk_combo_box_get_focus_on_click (GtkComboBox *combo)
   
   return combo->priv->focus_on_click;
 }
+
+#define __GTK_COMBO_BOX_C__
+#include "gtkaliasdef.c"
index 75985965888a6499eaa86fb28bfe954569c386ca..9c3e698594ca3f83ca076a4dc4130418cd95c3a0 100644 (file)
@@ -18,7 +18,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkcomboboxentry.h"
 #include "gtkcelllayout.h"
 
@@ -26,6 +25,7 @@
 #include "gtkcellrenderertext.h"
 
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define GTK_COMBO_BOX_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryPrivate))
 
@@ -382,3 +382,6 @@ gtk_combo_box_entry_new_text (void)
 
   return entry_box;
 }
+
+#define __GTK_COMBO_BOX_ENTRY_C__
+#include "gtkaliasdef.c"
index 9ba1e7000aef993d4a1d7bc3da7e4e8fab90af78..45da39db509e6a9903807d5bc178134c2306a5af 100644 (file)
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "gtkalias.h"
 #include "gtkcontainer.h"
 #include "gtkprivate.h"
 #include "gtkmain.h"
@@ -39,6 +38,7 @@
 #include "gtktoolbar.h"
 #include <gobject/gobjectnotifyqueue.c>
 #include <gobject/gvaluecollector.h>
+#include "gtkalias.h"
 
 
 enum {
@@ -2463,3 +2463,6 @@ gtk_container_propagate_expose (GtkContainer   *container,
       gdk_event_free (child_event);
     }
 }
+
+#define __GTK_CONTAINER_C__
+#include "gtkaliasdef.c"
index afb8b12fdcbf289fa1a249c937728b49d68b91d7..612fe8bcbe1ec932822199fb304debd2ad0b91d1 100644 (file)
 #include <gtk/gtkadjustment.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_CONTAINER              (gtk_container_get_type ())
 #define GTK_CONTAINER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer))
@@ -223,9 +220,6 @@ GList *_gtk_container_focus_sort             (GtkContainer     *container,
 #define        gtk_container_border_width              gtk_container_set_border_width
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_CONTAINER_H__ */
index 6434f17132d5ccfea0fb4c6fc6a4df23e5226f5a..16e411ebdfacd80329f656f19d5f31c607c42e4a 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#include "gtkalias.h"
 #include "gtkctree.h"
 #include "gtkbindings.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkdnd.h"
 #include <gdk/gdkkeysyms.h>
+#include "gtkalias.h"
 
 #define PM_SIZE                    8
 #define TAB_SIZE                   (PM_SIZE + 6)
@@ -6119,3 +6119,6 @@ gtk_ctree_node_get_type (void)
 
   return our_type;
 }
+
+#define __GTK_CTREE_C__
+#include "gtkaliasdef.c"
index 9f6bd2a7e6f773fdb7e3304e8de0966864c74f3e..a67ee5f9a1bea48375f0bbeaae6ec53353e7b8c3 100644 (file)
@@ -35,9 +35,7 @@
 
 #include <gtk/gtkclist.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif                         /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_CTREE            (gtk_ctree_get_type ())
 #define GTK_CTREE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_CTREE, GtkCTree))
@@ -440,9 +438,7 @@ void gtk_ctree_sort_recursive                    (GtkCTree     *ctree,
  */
 GType   gtk_ctree_node_get_type                  (void) G_GNUC_CONST;
 
-#ifdef __cplusplus
-}
-#endif                         /* __cplusplus */
+G_END_DECLS
 
 #endif                         /* __GTK_CTREE_H__ */
 
index c3ee5aa98a43d77916abeaace90c8d01e7ffce45..20f637ba8579bb7436bb7011e09a0f6669410041 100644 (file)
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <math.h>
 
-#include "gtkalias.h"
 #include "gtkcurve.h"
 #include "gtkdrawingarea.h"
 #include "gtkmain.h"
@@ -37,6 +36,7 @@
 #include "gtkradiobutton.h"
 #include "gtktable.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define RADIUS         3       /* radius of the control points */
 #define MIN_DISTANCE   8       /* min distance between control points */
@@ -1044,3 +1044,6 @@ gtk_curve_finalize (GObject *object)
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
+
+#define __GTK_CURVE_C__
+#include "gtkaliasdef.c"
index efc28a4ba1a8513779365c0b987137ac42fb47e8..94c2c59b1bc94afee1a520daad1cffebc174f7a6 100644 (file)
 #include <gdk/gdk.h>
 #include <gtk/gtkdrawingarea.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_CURVE                  (gtk_curve_get_type ())
 #define GTK_CURVE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CURVE, GtkCurve))
@@ -110,9 +107,6 @@ void                gtk_curve_set_vector    (GtkCurve *curve,
 void           gtk_curve_set_curve_type (GtkCurve *curve, GtkCurveType type);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_CURVE_H__ */
index a93ed7b8c7edcad0fa1813c818426d81d4e4b8fe..c860acd407fd1f55c47ca52440ac81fdce75344e 100644 (file)
@@ -25,7 +25,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkbutton.h"
 #include "gtkdialog.h"
 #include "gtkhbbox.h"
@@ -37,6 +36,7 @@
 #include "gtkmain.h"
 #include "gtkintl.h"
 #include "gtkbindings.h"
+#include "gtkalias.h"
 
 #define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_DIALOG, GtkDialogPrivate))
 
@@ -1237,3 +1237,5 @@ gtk_dialog_set_alternative_button_order_from_array (GtkDialog *dialog,
     }
 }
 
+#define __GTK_DIALOG_C__
+#include "gtkaliasdef.c"
index 27ffa201d94f02046e670b5681276a141c2cd7c3..0af0643b141931c1dbbd9b8851b7eb5a71c3656a 100644 (file)
@@ -32,9 +32,7 @@
 #include <gtk/gtkwindow.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Parameters for dialog construction */
 typedef enum
@@ -174,9 +172,6 @@ void _gtk_dialog_set_ignore_separator (GtkDialog *dialog,
 gint _gtk_dialog_get_response_for_widget (GtkDialog *dialog,
                                          GtkWidget *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_DIALOG_H__ */
index e58187475f29092ea76e021ddd8911b334ebf94c..18c7d13be1ffc4fc6091eb9dd7aa9d61548a8dda 100644 (file)
@@ -25,7 +25,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gdkconfig.h"
 
 #include "gdk/gdkkeysyms.h"
@@ -37,6 +36,7 @@
 #include "gtkplug.h"
 #include "gtkstock.h"
 #include "gtkwindow.h"
+#include "gtkalias.h"
 
 static GSList *source_widgets = NULL;
 
@@ -3699,3 +3699,6 @@ gtk_drag_check_threshold (GtkWidget *widget,
   return (ABS (current_x - start_x) > drag_threshold ||
          ABS (current_y - start_y) > drag_threshold);
 }
+
+#define __GTK_DND_C__
+#include "gtkaliasdef.c"
index 586980b0611b721c1641bcebb265a545704ede79..ba52415df87b6a214f7dbd12722054d3d21949a4 100644 (file)
@@ -32,9 +32,7 @@
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkselection.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
   GTK_DEST_DEFAULT_MOTION     = 1 << 0, /* respond to "drag_motion" */
@@ -168,9 +166,7 @@ void gtk_drag_set_default_icon (GdkColormap   *colormap,
                                gint           hot_y);
 #endif /* !GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_DND_H__ */
 
index 76565688811f945e21fdeef6cb56a21491920837..edfab9b5ccbe8105399ea9f90b2f16438f0f021d 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkdrawingarea.h"
+#include "gtkalias.h"
 
 
 static void gtk_drawing_area_class_init    (GtkDrawingAreaClass *klass);
@@ -170,3 +170,6 @@ gtk_drawing_area_send_configure (GtkDrawingArea *darea)
   gtk_widget_event (widget, event);
   gdk_event_free (event);
 }
+
+#define __GTK_DRAWING_AREA_C__
+#include "gtkaliasdef.c"
index a483117c89c87962bfa389020701faff2e9a4467..fd445e16ac1fb7eca9fe1517f00307ee1cfa9ef8 100644 (file)
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_DRAWING_AREA            (gtk_drawing_area_get_type ())
 #define GTK_DRAWING_AREA(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingArea))
@@ -77,9 +74,6 @@ void       gtk_drawing_area_size       (GtkDrawingArea      *darea,
 #endif /* GTK_DISABLE_DEPRECATED */
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_DRAWING_AREA_H__ */
index 5e176f86cd3a7d540785ee9c4349bb7cb156b896..80473c1e645b085d7e4cdb1f0f7e6597e6dd6761 100644 (file)
@@ -27,9 +27,9 @@
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkeditable.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 
 static void   gtk_editable_base_init             (gpointer g_class);
@@ -242,3 +242,6 @@ gtk_editable_get_editable (GtkEditable *editable)
 
   return value;
 }
+
+#define __GTK_EDITABLE_C__
+#include "gtkaliasdef.c"
index 331712d76322b6a59349e066372cee8c43220421..46de8150efae8c14448f294373250d4639e5e82a 100644 (file)
 #include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_EDITABLE             (gtk_editable_get_type ())
 #define GTK_EDITABLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EDITABLE, GtkEditable))
@@ -111,9 +108,6 @@ void     gtk_editable_set_editable         (GtkEditable *editable,
                                            gboolean     is_editable);
 gboolean gtk_editable_get_editable         (GtkEditable *editable);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_EDITABLE_H__ */
index 0659e12bf330576e1e8ca72fadb9e0e70f5e671e..0ad8879f2d1e3d05f9e97c18a329eb2b3944566e 100644 (file)
@@ -30,7 +30,6 @@
 #include <pango/pango.h>
 
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 #include "gtkbindings.h"
 #include "gtkcelleditable.h"
 #include "gtkclipboard.h"
@@ -53,6 +52,7 @@
 #include "gtktreeselection.h"
 #include "gtkentryprivate.h"
 #include "gtkcelllayout.h"
+#include "gtkalias.h"
 
 #define GTK_ENTRY_COMPLETION_KEY "gtk-entry-completion-key"
 
@@ -5390,3 +5390,6 @@ gtk_entry_get_completion (GtkEntry *entry)
 
   return completion;
 }
+
+#define __GTK_ENTRY_C__
+#include "gtkaliasdef.c"
index 0c4c2aaa4ee2bd33b64a19f74b5b65cf926d6a79..6ba485aa8bec545ebb6504d6e1656955050309d1 100644 (file)
 #include <gtk/gtkentrycompletion.h>
 #include <pango/pango.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ENTRY                  (gtk_entry_get_type ())
 #define GTK_ENTRY(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY, GtkEntry))
@@ -221,9 +218,6 @@ void      _gtk_entry_get_borders                (GtkEntry *entry,
                                                 gint     *yborder);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_ENTRY_H__ */
index 4af7527a56017ee96b7fab9bcee240aaa65ff1b2..e001a3db3ed2c071a7ad7f6e5fbc4979bda13b1c 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkentrycompletion.h"
 #include "gtkentryprivate.h"
 #include "gtkcelllayout.h"
+#include "gtkalias.h"
 
 #include "gtkintl.h"
 #include "gtkcellrenderertext.h"
@@ -1607,3 +1607,6 @@ gtk_entry_completion_get_popup_completion (GtkEntryCompletion *completion)
   
   return completion->priv->popup_completion;
 }
+
+#define __GTK_ENTRY_COMPLETION_C__
+#include "gtkaliasdef.c"
index 39f1fc5a482eedb332a34d7327c04351a9eb2759..4fa3ab8d0900ffb7c280e6c27548c857a4ed02ca 100644 (file)
@@ -25,9 +25,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkeventbox.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 typedef struct 
 {
@@ -610,3 +610,5 @@ gtk_event_box_expose (GtkWidget      *widget,
   return FALSE;
 }
 
+#define __GTK_EVENT_BOX_C__
+#include "gtkaliasdef.c"
index 5a5586b7d59f2ad1bc1702b42853295973a3948c..3fba8b4b6f3fc470dffc5969984e49655679a294 100644 (file)
 #include <gtk/gtkbin.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_EVENT_BOX              (gtk_event_box_get_type ())
 #define GTK_EVENT_BOX(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EVENT_BOX, GtkEventBox))
@@ -66,9 +63,6 @@ gboolean   gtk_event_box_get_above_child    (GtkEventBox *event_box);
 void       gtk_event_box_set_above_child    (GtkEventBox *event_box,
                                             gboolean     above_child);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_EVENT_BOX_H__ */
index 59f4a723473b4967b8a353fdc70831e97ad08d7f..82516f7111e41f0a1e5d2127dc7e15652c17af5f 100644 (file)
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include "gtkalias.h"
 #include "gtkexpander.h"
 
 #include "gtklabel.h"
@@ -33,6 +32,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include <gdk/gdkkeysyms.h>
+#include "gtkalias.h"
 
 #define GTK_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, GtkExpanderPrivate))
 
@@ -1640,3 +1640,6 @@ gtk_expander_get_label_widget (GtkExpander *expander)
 
   return expander->priv->label_widget;
 }
+
+#define __GTK_EXPANDER_C__
+#include "gtkaliasdef.c"
index 6e8f54d32ebe49f00399ea1998f92a4a1cfd2954..994e5cde5e48fe04f012bc7e8e7c58ad0d39793f 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkfilechooser.h"
 #include "gtkfilechooserprivate.h"
 #include "gtkfilesystem.h"
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
+#include "gtkalias.h"
 
 static void gtk_file_chooser_class_init (gpointer g_iface);
 
@@ -1999,3 +1999,6 @@ gtk_file_chooser_list_shortcut_folders (GtkFileChooser *chooser)
 }
 
 #endif
+
+#define __GTK_FILE_CHOOSER_C__
+#include "gtkaliasdef.c"
index eb7815e0c4c4a3d7abeadbe1bc5689a0b4cc2e94..dedd2a9fe8d04d745ffe819de5b8ead1ba0ca67c 100644 (file)
@@ -30,7 +30,6 @@
 
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkintl.h"
 #include "gtkbutton.h"
 #include "gtkcelllayout.h"
@@ -56,6 +55,8 @@
 #include "gtkfilesystemwin32.h"
 #endif
 
+#include "gtkalias.h"
+
 /* **************** *
  *  Private Macros  *
  * **************** */
@@ -2339,3 +2340,6 @@ gtk_file_chooser_button_set_width_chars (GtkFileChooserButton *button,
   gtk_label_set_width_chars (GTK_LABEL (button->priv->label), n_chars);
   g_object_notify (G_OBJECT (button), "width-chars");
 }
+
+#define __GTK_FILE_CHOOSER_BUTTON_C__
+#include "gtkaliasdef.c"
index b0fa607e1d6bb0c6fbd22db5e733ae8e7c1b3dfd..8e5a45c627de28dd64b15bcd3ec062045182637f 100644 (file)
@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 #include "gtkalignment.h"
 #include "gtkbindings.h"
 #include "gtkbutton.h"
@@ -74,6 +73,8 @@
 #include "gtkfilesystemwin32.h"
 #endif
 
+#include "gtkalias.h"
+
 #include <errno.h>
 #include <string.h>
 #include <time.h>
@@ -6501,3 +6502,6 @@ shortcuts_model_filter_new (GtkFileChooserDefault *impl,
 
   return GTK_TREE_MODEL (model);
 }
+
+#define __GTK_FILE_CHOOSER_DEFAULT_C__
+#include "gtkaliasdef.c"
index 2e990a6f60c3d339e289c5f8b9021c1e61511462..3c0234f2dd4fe38f9f8415d35a16105f22932b75 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkfilechooserdialog.h"
 #include "gtkfilechooserwidget.h"
 #include "gtkfilechooserutils.h"
 #include "gtkfilechooserembed.h"
 #include "gtkfilesystem.h"
 #include "gtktypebuiltins.h"
+#include "gtkalias.h"
 
 #include <stdarg.h>
 
@@ -667,3 +667,6 @@ gtk_file_chooser_dialog_new_with_backend (const gchar          *title,
 
   return result;
 }
+
+#define __GTK_FILE_CHOOSER_DIALOG_C__
+#include "gtkaliasdef.c"
index d192868f0c6ad875b4ab2e7cb6c49d567adb5ede..68d25c9099ffd374f92f2b54db01d1188647241c 100644 (file)
@@ -1,7 +1,7 @@
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkfilechooserembed.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 static void gtk_file_chooser_embed_class_init (gpointer g_iface);
 static void delegate_get_default_size         (GtkFileChooserEmbed *chooser_embed,
@@ -181,3 +181,5 @@ _gtk_file_chooser_embed_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
   GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically);
 }
 
+#define __GTK_FILE_CHOOSER_EMBED_C__
+#include "gtkaliasdef.c"
index 66bc6b566e15c607674fd2f66f3394ee8e92fa21..9bfcafcf2baf66ee77a04457f7ad74f74bc023be 100644 (file)
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkcelllayout.h"
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"
 #include "gtkfilechooserentry.h"
 #include "gtkmain.h"
+#include "gtkalias.h"
 
 typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass;
 
@@ -991,3 +991,6 @@ _gtk_file_chooser_entry_get_action (GtkFileChooserEntry *chooser_entry)
   
   return chooser_entry->action;
 }
+
+#define __GTK_FILE_CHOOSER_ENTRY_C__
+#include "gtkaliasdef.c"
index 2ba38fbf521ccdb3766418ef373a69253a8dbaa8..91275db9b2f8f4b59902531811735945b88bab71 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkfilechooserutils.h"
 #include "gtkfilechooser.h"
 #include "gtkfilesystem.h"
 #include "gtktypebuiltins.h"
+#include "gtkalias.h"
 
 static gboolean       delegate_set_current_folder     (GtkFileChooser    *chooser,
                                                       const GtkFilePath *path,
@@ -341,3 +341,6 @@ delegate_file_activated (GtkFileChooser    *chooser,
 {
   g_signal_emit_by_name (data, "file-activated");
 }
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"
index 00014727befbc42c6e02867d6dd565319cf1ae56..00798080fc6382b80139b4edb98a50b72050d320 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkfilechooserwidget.h"
 #include "gtkfilechooserdefault.h"
 #include "gtkfilechooserutils.h"
 #include "gtktypebuiltins.h"
 #include "gtkfilechooserembed.h"
+#include "gtkalias.h"
 
 struct _GtkFileChooserWidgetPrivate
 {
@@ -248,3 +248,6 @@ gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction  action,
                       "file-system-backend", backend,
                       NULL);
 }
+
+#define __GTK_FILE_CHOOSER_WIDGET_C__
+#include "gtkaliasdef.c"
index 0f6379fda0ebc8ce1589d5639529e1741645384e..936616191515ff1f44c0d6c31c3307978431c5ca 100644 (file)
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkfilefilter.h"
 #include "gtkobject.h"
 #include "gtkprivate.h"
 
+#include "gtkalias.h"
+
 #ifdef G_OS_UNIX
 #define XDG_PREFIX _gtk_xdg
 #include "xdgmime/xdgmime.h"
@@ -453,3 +454,6 @@ gtk_file_filter_filter (GtkFileFilter           *filter,
 
   return FALSE;
 }
+
+#define __GTK_FILE_FILTER_C__
+#include "gtkaliasdef.c"
index 7324e49b4e67b7a0b8bda214a076c74dfc599784..c145a22bd8bf0de042cd5ef6d9d7e4c443a5fdf3 100644 (file)
@@ -56,7 +56,6 @@
 #endif
 
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 #include "gtkbutton.h"
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"
@@ -87,6 +86,8 @@
 #define WANT_HPANED 1
 #include "gtkhpaned.h"
 
+#include "gtkalias.h"
+
 #ifdef G_OS_WIN32
 #include <direct.h>
 #include <io.h>
@@ -4091,3 +4092,6 @@ gtk_file_selection_get_selections (GtkFileSelection *filesel)
 }
 
 #endif /* G_OS_WIN32 */
+
+#define __GTK_FILESEL_C__
+#include "gtkaliasdef.c"
index 4943d0024bb83b8cb0c0bc1f00f8bed88e53a346..f62e80ac3fd9b3efdd002bd4d2183166235ba2dd 100644 (file)
 
 #include <config.h>
 #include <gmodule.h>
-#include "gtkalias.h"
 #include "gtkfilesystem.h"
 #include "gtkicontheme.h"
 #include "gtkmodules.h"
+#include "gtkalias.h"
 
 #include <string.h>
 
@@ -1147,4 +1147,5 @@ _gtk_file_system_create (const char *file_system_name)
   return fs;
 }
 
-
+#define __GTK_FILE_SYSTEM_C__
+#include "gtkaliasdef.c"
index 4f8ced177b451ff297f6c683b8ba22a71adba243..b841b95fd06d161fbcec9933026641bb65efd22e 100644 (file)
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkfilesystemmodel.h"
 #include "gtkfilesystem.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtktreednd.h"
 #include "gtktreemodel.h"
+#include "gtkalias.h"
 
 typedef struct _GtkFileSystemModelClass GtkFileSystemModelClass;
 typedef struct _FileModelNode           FileModelNode;
@@ -1869,3 +1869,6 @@ root_files_removed_callback (GtkFileFolder      *folder,
 {
   do_files_removed (model, NULL, paths);
 }
+
+#define __GTK_FILE_SYSTEM_MODEL_C__
+#include "gtkaliasdef.c"
index f84ec0fda93ea7d1f68fc135888eefd6cf31a8ac..28960cfafdf3a996339406db580834bcd158c4df 100644 (file)
 
 #include <config.h>
 
-#include "gtkalias.h"
 #include "gtkfilesystem.h"
 #include "gtkfilesystemunix.h"
 #include "gtkicontheme.h"
 #include "gtkintl.h"
 #include "gtkstock.h"
+#include "gtkalias.h"
 
 #define XDG_PREFIX _gtk_xdg
 #include "xdgmime/xdgmime.h"
@@ -2062,3 +2062,6 @@ filename_is_root (const char *filename)
 
   return (after_root != NULL && *after_root == '\0');
 }
+
+#define __GTK_FILE_SYSTEM_UNIX_C__
+#include "gtkaliasdef.c"
index 7821b4b21d265c94b3a60d59808b74f983d52135..2824920e1995d535d00f57d4a4e428b3f67f23e3 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkfilesystem.h"
 #include "gtkfilesystemwin32.h"
 #include "gtkintl.h"
 #include "gtkstock.h"
 #include "gtkiconfactory.h"
+#include "gtkalias.h"
 
 #include <glib/gstdio.h>
 
@@ -1711,3 +1711,6 @@ _gtk_file_system_win32_path_compare (const gchar *path1,
 
   return retval;
 }
+
+#define __GTK_FILE_SYSTEM_WIN32_C__
+#include "gtkaliasdef.c"
index e98eb1223ba36ffd905e7bd7213d5f8a1ea511ad..fb0d88faf481cdeaf9e03d8fc6fd0f8a5451b532 100644 (file)
@@ -25,9 +25,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkfixed.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum {
   CHILD_PROP_0,
@@ -532,3 +532,6 @@ gtk_fixed_get_has_window (GtkFixed *fixed)
 
   return !GTK_WIDGET_NO_WINDOW (fixed);
 }
+
+#define __GTK_FIXED_C__
+#include "gtkaliasdef.c"
index 53fdd80fdd26a446d04db25d77ae6bda4cde00a2..a313568cc83a44ff3f88077ed6f106c076b7ceb6 100644 (file)
 #include <gtk/gtkcontainer.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_FIXED                  (gtk_fixed_get_type ())
 #define GTK_FIXED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FIXED, GtkFixed))
@@ -83,9 +80,6 @@ void       gtk_fixed_set_has_window    (GtkFixed       *fixed,
                                        gboolean        has_window);
 gboolean   gtk_fixed_get_has_window    (GtkFixed       *fixed);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_FIXED_H__ */
index de53ffcc7aa22cd773fbc727b524f6d67394cde9..2d2615a0daffc21c3e82b67ef8da8a194ec69cb1 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <config.h>
 
-#include "gtkalias.h"
 #include "gtkfontbutton.h"
 
 #include "gtksignal.h"
@@ -41,6 +40,7 @@
 #include "gtkimage.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -936,10 +936,5 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
   pango_font_description_free (desc);
 } 
 
-
-
-
-
-
-
-
+#define __GTK_FONT_BUTTON_C__
+#include "gtkaliasdef.c"
index ff621b70abbbb72525112b4fea053697ff5b8cb0..a9af76e8be9dd5237250f31e4a5493205f4bc208 100644 (file)
@@ -39,7 +39,6 @@
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
 
-#include "gtkalias.h"
 #include "gtkfontsel.h"
 
 #include "gtkbutton.h"
@@ -59,6 +58,7 @@
 #include "gtkscrolledwindow.h"
 #include "gtkintl.h"
 #include "gtkaccessible.h"
+#include "gtkalias.h"
 
 /* We don't enable the font and style entries because they don't add
  * much in terms of visible effect and have a weird effect on keynav.
@@ -1430,3 +1430,6 @@ gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
 {
   gtk_font_selection_set_preview_text (GTK_FONT_SELECTION (fsd->fontsel), text);
 }
+
+#define __GTK_FONTSEL_C__
+#include "gtkaliasdef.c"
index 3f48b118d395a4947bdc1b3891638adee6b8a4a6..f41339910d6cacb95666dc134c2889a8fcfcc577 100644 (file)
@@ -36,9 +36,7 @@
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkvbox.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_FONT_SELECTION              (gtk_font_selection_get_type ())
 #define GTK_FONT_SELECTION(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection))
@@ -194,9 +192,7 @@ void         gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
                                                     const gchar            *text);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_FONTSEL_H__ */
index 32274ff80b107a4eb3acfd37ffa1ab5532cc0da3..0ffd0874c1ba778a240e2d2849185ae598289184 100644 (file)
 
 #include <config.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtkframe.h"
 #include "gtklabel.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define LABEL_PAD 1
 #define LABEL_SIDE_PAD 2
@@ -720,3 +720,6 @@ gtk_frame_real_compute_child_allocation (GtkFrame      *frame,
   child_allocation->x += allocation->x;
   child_allocation->y += allocation->y;
 }
+
+#define __GTK_FRAME_C__
+#include "gtkaliasdef.c"
index 5da172a5bf33b8464b4ca78f9dd61fec96b8d5eb..fa2f94856655e8d7fcbee30fc10f650597c28eb0 100644 (file)
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "gtkalias.h"
 #include "gtkgamma.h"
 #include "gtkcurve.h"
 #include "gtkdialog.h"
@@ -45,6 +44,7 @@
 #include "gtkvbox.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 static GtkVBoxClass *parent_class = NULL;
 
@@ -486,3 +486,5 @@ gtk_gamma_curve_destroy (GtkObject *object)
     (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
+#define __GTK_GAMMA_CURVE_C__
+#include "gtkaliasdef.c"
index bbf1aab21918136944448e177c63d32360afa0bf..fa6999b3724679ee74edc1077c2d7ec057e2d88b 100644 (file)
 #include <gtk/gtkvbox.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_GAMMA_CURVE            (gtk_gamma_curve_get_type ())
 #define GTK_GAMMA_CURVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurve))
@@ -87,9 +84,6 @@ GType      gtk_gamma_curve_get_type (void) G_GNUC_CONST;
 GtkWidget* gtk_gamma_curve_new      (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_GAMMA_CURVE_H__ */
index 12ffc8d73871b7f6d96e5ada1d00474feffa90a9..09c5a62123b219804c05f1cf8712637b96b34ba4 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkgc.h"
+#include "gtkalias.h"
 
 
 typedef struct _GtkGCKey       GtkGCKey;
@@ -415,3 +415,6 @@ gtk_gc_drawable_equal (GtkGCDrawable *a,
 {
   return (a->depth == b->depth);
 }
+
+#define __GTK_GC_C__
+#include "gtkaliasdef.c"
index 78e26c6ac3ca6ef7703cd918183ace717c68df56..38d70a6bb733af4d8c20e907ad782c110c8d2afa 100644 (file)
 #include <gdk/gdk.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 GdkGC* gtk_gc_get     (gint             depth,
                       GdkColormap     *colormap,
@@ -43,9 +40,6 @@ GdkGC* gtk_gc_get     (gint             depth,
 void   gtk_gc_release (GdkGC           *gc);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_GC_H__ */
index 7db1625a7b6f3151db64e26f3c3ce9ed7e0eb259..b4bdd7d3d6f8c9f5558cb69e4eea5daa996a39ff 100644 (file)
 
 #include <config.h>
 #include <stdlib.h>
-#include "gtkalias.h"
 #include "gtkhandlebox.h"
 #include "gtkinvisible.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 typedef struct _GtkHandleBoxPrivate GtkHandleBoxPrivate;
 
@@ -1446,4 +1446,7 @@ gtk_handle_box_end_drag (GtkHandleBox *hb,
   g_signal_handlers_disconnect_by_func (invisible,
                                        G_CALLBACK (gtk_handle_box_grab_event),
                                        hb);
- }
+}
+
+#define __GTK_HANDLE_BOX_C__
+#include "gtkaliasdef.c"
index 07010ba071d469a5535d94a856d9d0f1ca988e80..c690a04b16b4476c0a01b51dd43d7cabab7a8517 100644 (file)
 #include <gtk/gtkbin.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_HANDLE_BOX            (gtk_handle_box_get_type ())
 #define GTK_HANDLE_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBox))
@@ -106,10 +103,6 @@ void          gtk_handle_box_set_snap_edge        (GtkHandleBox    *handle_box,
                                                   GtkPositionType  edge);
 GtkPositionType gtk_handle_box_get_snap_edge      (GtkHandleBox    *handle_box);
 
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_HANDLE_BOX_H__ */
index 3620913b3aae9a80a1d982c2b79c199dc0c8f85b..880dcdf3743c47791cd8a3ae2eff000dc872cf3d 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkhbbox.h"
+#include "gtkalias.h"
 
 
 static void gtk_hbutton_box_class_init    (GtkHButtonBoxClass   *klass);
@@ -305,3 +305,5 @@ gtk_hbutton_box_size_allocate (GtkWidget     *widget,
     }
 }
   
+#define __GTK_HBUTTON_BOX_C__
+#include "gtkaliasdef.c"
index 52203b47240ca9f56915dc158233b3b8adbbcdd4..7423a7547b7cec0429064bc0826bd8816e0bae59 100644 (file)
 #include <gtk/gtkbbox.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_HBUTTON_BOX                  (gtk_hbutton_box_get_type ())
 #define GTK_HBUTTON_BOX(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBUTTON_BOX, GtkHButtonBox))
@@ -71,9 +68,6 @@ void gtk_hbutton_box_set_spacing_default (gint spacing);
 void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout);
 #endif
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_HBUTTON_BOX_H__ */
index e3e88d79f3d324e8b27b84a60dca30097f1f2a31..5b3c38bd0014f3ffcc48e05d182175762bf4d3f6 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkhbox.h"
+#include "gtkalias.h"
 
 
 static void gtk_hbox_class_init    (GtkHBoxClass   *klass);
@@ -332,3 +332,6 @@ gtk_hbox_size_allocate (GtkWidget     *widget,
        }
     }
 }
+
+#define __GTK_HBOX_C__
+#include "gtkaliasdef.c"
index 600e80cfb1e8c5816d07885edc026959b8509b87..5296e21e3cdf8480b361aa25456831bf5b9e468d 100644 (file)
 #include <gtk/gtkbox.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_HBOX            (gtk_hbox_get_type ())
 #define GTK_HBOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HBOX, GtkHBox))
@@ -64,9 +61,6 @@ GtkWidget* gtk_hbox_new            (gboolean homogeneous,
                              gint spacing);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_HBOX_H__ */
index bbc8e47b20453a46a0d4e3025bf6eeca7283477a..25a6f9756597e6c84491e63cc1ea06690df36c76 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkhpaned.h"
+#include "gtkalias.h"
 
 static void     gtk_hpaned_class_init     (GtkHPanedClass *klass);
 static void     gtk_hpaned_init           (GtkHPaned      *hpaned);
@@ -247,3 +247,6 @@ gtk_hpaned_size_allocate (GtkWidget     *widget,
        gtk_widget_size_allocate (paned->child2, &child_allocation);
     }
 }
+
+#define __GTK_HPANED_C__
+#include "gtkaliasdef.c"
index 2aed5aefe2d9521d6e2df6c552497cc35667b7d4..2272dfd4a737dcbe2640e8db2dae2bfe0d2f90dc 100644 (file)
@@ -29,9 +29,7 @@
 
 #include <gtk/gtkpaned.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_HPANED                   (gtk_hpaned_get_type ())
 #define GTK_HPANED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HPANED, GtkHPaned))
@@ -57,8 +55,6 @@ struct _GtkHPanedClass
 GType      gtk_hpaned_get_type (void) G_GNUC_CONST;
 GtkWidget *gtk_hpaned_new      (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_HPANED_H__ */
index b4997c8957be04cbfe695ecfffcbbaa65bed829b..f88dad5f273d001bab117eb3f6fc373fc3c745ef 100644 (file)
@@ -28,8 +28,8 @@
 #include <math.h>
 #include <glib/gprintf.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtkhruler.h"
+#include "gtkalias.h"
 
 
 #define RULER_HEIGHT          14
@@ -326,3 +326,6 @@ gtk_hruler_draw_pos (GtkRuler *ruler)
        }
     }
 }
+
+#define __GTK_HRULER_C__
+#include "gtkaliasdef.c"
index 3440d1b528c3f167ba06d09310fa27f20adbf082..375b808644c9ec87c3d7ed62294a7289ab08b485 100644 (file)
@@ -42,9 +42,7 @@
 #include <gtk/gtkruler.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_HRULER                   (gtk_hruler_get_type ())
@@ -73,9 +71,7 @@ GType      gtk_hruler_get_type (void) G_GNUC_CONST;
 GtkWidget* gtk_hruler_new      (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_HRULER_H__ */
index 338e9351ae46f9d134b67eae6173745406bcb98a..d954e9c5508a545b9dc9d27a29722b39fe7ec038 100644 (file)
@@ -28,9 +28,9 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "gtkalias.h"
 #include "gtkhscale.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 static gpointer parent_class;
 
@@ -258,3 +258,6 @@ gtk_hscale_get_layout_offsets (GtkScale *scale,
   *x += widget->allocation.x;
   *y += widget->allocation.y;
 }
+
+#define __GTK_HSCALE_C__
+#include "gtkaliasdef.c"
index 9b820bb111ded15cd551ae92c125b9ceddc5f011..6f410907745796e50da8d4009275a26fec9534fb 100644 (file)
 #include <gtk/gtkscale.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_HSCALE            (gtk_hscale_get_type ())
 #define GTK_HSCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSCALE, GtkHScale))
@@ -66,9 +63,6 @@ GtkWidget* gtk_hscale_new_with_range (gdouble        min,
                                       gdouble        step);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_HSCALE_H__ */
index 0280a493f9e798fd01e05cfe38f3a0775c0f117a..135858aa836688917c58be2abd0349fe7d96014b 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkhscrollbar.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 static void     gtk_hscrollbar_class_init       (GtkHScrollbarClass *klass);
 static void     gtk_hscrollbar_init             (GtkHScrollbar      *hscrollbar);
@@ -90,3 +90,5 @@ gtk_hscrollbar_new (GtkAdjustment *adjustment)
   return hscrollbar;
 }
 
+#define __GTK_HSCROLLBAR_C__
+#include "gtkaliasdef.c"
index 83fbe2a323b256590ea11bb9a75bc04f438ec7cb..12e9b51064433395d7b06546780aa2fc709574df 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkhseparator.h"
+#include "gtkalias.h"
 
 
 static void gtk_hseparator_class_init (GtkHSeparatorClass *klass);
@@ -101,3 +101,6 @@ gtk_hseparator_expose (GtkWidget      *widget,
 
   return FALSE;
 }
+
+#define __GTK_HSEPARATOR_C__
+#include "gtkaliasdef.c"
index 80283020185a8fb17c5d6810b81207c2e703138d..008a2fe40365c9ae3641d026c1ca9af3c50cf7a5 100644 (file)
 #include <gtk/gtkseparator.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_HSEPARATOR                  (gtk_hseparator_get_type ())
 #define GTK_HSEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparator))
@@ -63,9 +60,6 @@ GType      gtk_hseparator_get_type (void) G_GNUC_CONST;
 GtkWidget* gtk_hseparator_new      (void);
 
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_HSEPARATOR_H__ */
index cc8203d660e8edee77f3cd3def9c7db1441e692d..61353a92d0f5e6f37e1a006db0563866961bdfbe 100644 (file)
 #include <config.h>
 #include <math.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtkhsv.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkbindings.h"
 #include "gtkcontainer.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
@@ -917,7 +917,7 @@ gtk_hsv_motion (GtkWidget      *widget,
 
 /* Redrawing */
 
-void
+static void
 set_source_surface (cairo_t         *cr,
                    cairo_surface_t *surface)
 {
@@ -1712,3 +1712,6 @@ gtk_hsv_move (GtkHSV          *hsv,
   
   gtk_hsv_set_color (hsv, hue, sat, val);
 }
+
+#define __GTK_HSV_C__
+#include "gtkaliasdef.c"
index c8dac79569f6520c92a0c49e734951e3b1b52c2e..b8bdd8323a27b3c4e708c032897d27b0ce8416b0 100644 (file)
@@ -33,9 +33,7 @@
 
 #include <gtk/gtkcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS 
 
 #define GTK_TYPE_HSV            (gtk_hsv_get_type ())
 #define GTK_HSV(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_HSV, GtkHSV))
@@ -101,8 +99,6 @@ void       gtk_rgb_to_hsv       (gdouble    r,
                                 gdouble   *v);
 
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* __GTK_HSV_H__ */
index 5849549ee30ccf0a998e5a8991a378f53b93da96..20166d8a64797adf3180da59a72737db38dbac3e 100644 (file)
@@ -233,7 +233,7 @@ icon_name_hash (gconstpointer key)
   return h;
 }
 
-gint
+static gint
 find_image_offset (GtkIconCache *cache,
                   const gchar  *icon_name,
                   const gchar  *directory)
index 74be267e845896dfa1a25d007e020934d3de2186..5706320611be7359e94c0a20ed7ffe8db2544225 100644 (file)
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include "gtkalias.h"
 #include <pango/pango-utils.h> /* For pango_scan_* */
 #include "gtkiconfactory.h"
 #include "stock-icons/gtkstockpixbufs.h"
@@ -38,6 +37,7 @@
 #include "gtkstock.h"
 #include "gtkwidget.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 static GSList *all_icon_factories = NULL;
@@ -2988,3 +2988,6 @@ gtk_icon_source_get_filename (const GtkIconSource *source)
 }
 
 #endif
+
+#define __GTK_ICON_FACTORY_C__
+#include "gtkaliasdef.c"
index 79e6ffecccc0016528546830986bf79bfe4efcb1..38fb51492e15416648570441d31f129a13230001 100644 (file)
@@ -30,9 +30,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkrc.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GtkIconFactoryClass GtkIconFactoryClass;
 
@@ -182,8 +180,6 @@ void _gtk_icon_set_invalidate_caches (void);
 GSList* _gtk_icon_factory_list_ids (void);
 void _gtk_icon_factory_ensure_default_icons (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_ICON_FACTORY_H__ */
index d487fd8847308797fbe5ff59b4449931c8777c23..b8d88313f5d503589b8d39de4e334f1f1d017ee7 100644 (file)
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include "gtkalias.h"
 
 #ifdef G_OS_WIN32
 #ifndef S_ISDIR
@@ -42,7 +41,7 @@
 #include "gtkintl.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
-
+#include "gtkalias.h"
 
 
 #define DEFAULT_THEME_NAME "hicolor"
@@ -3025,3 +3024,6 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info)
 }
 
 #endif
+
+#define __GTK_ICON_THEME_C__
+#include "gtkaliasdef.c"
index 518bd00d320fd9636095e296b0d6bf7fdba3b1c5..b62586f756cc3f3999f90c08ccb46d6565e72cee 100644 (file)
@@ -24,7 +24,6 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "gtkalias.h"
 #include "gtkiconview.h"
 #include "gtkmarshalers.h"
 #include "gtkbindings.h"
@@ -35,6 +34,7 @@
 #include "gtkaccessible.h"
 #include "gtkwindow.h"
 #include "gtktextbuffer.h"
+#include "gtkalias.h"
 
 #undef DEBUG_ICON_VIEW
 
@@ -6234,3 +6234,5 @@ gtk_icon_view_get_accessible (GtkWidget *widget)
   return GTK_WIDGET_CLASS (parent_class)->get_accessible (widget);
 }
 
+#define __GTK_ICON_VIEW_C__
+#include "gtkaliasdef.c"
index b368075ce15bfc54afe1a37d5b7bd07a300f643c..87f1f9319a8fe91ff8f58fd44a5f4e6ef7b1ad30 100644 (file)
 
 #include <config.h>
 #include <math.h>
-#include "gtkalias.h"
 #include "gtkcontainer.h"
 #include "gtkimage.h"
 #include "gtkiconfactory.h"
 #include "gtkstock.h"
 #include "gtkicontheme.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 #include <string.h>
 
 typedef struct _GtkImagePrivate GtkImagePrivate;
@@ -2140,3 +2140,6 @@ gtk_image_set_from_file   (GtkImage    *image,
 }
 
 #endif
+
+#define __GTK_IMAGE_C__
+#include "gtkaliasdef.c"
index 829666220bb6b24e7882c900225b1a9211b1c5e1..701fe2d299c0bd3caf60986e8972d3a1e369afe2 100644 (file)
@@ -32,9 +32,7 @@
 #include <gtk/gtkmisc.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_IMAGE                  (gtk_image_get_type ())
 #define GTK_IMAGE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE, GtkImage))
@@ -220,9 +218,6 @@ void       gtk_image_get      (GtkImage   *image,
                               GdkBitmap **mask);
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_IMAGE_H__ */
index fb05efd46bdf85dad54e3a72ac5be00796bf8bd8..576e4c9ba23518a23fb96212d2e9a252fa364d4a 100644 (file)
@@ -25,7 +25,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkimagemenuitem.h"
 #include "gtkaccellabel.h"
 #include "gtkintl.h"
@@ -34,6 +33,7 @@
 #include "gtkimage.h"
 #include "gtkcontainer.h"
 #include "gtkwindow.h"
+#include "gtkalias.h"
 
 static void gtk_image_menu_item_class_init           (GtkImageMenuItemClass *klass);
 static void gtk_image_menu_item_init                 (GtkImageMenuItem      *image_menu_item);
@@ -606,3 +606,5 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget,
   show_image_change_notify (GTK_IMAGE_MENU_ITEM (widget));
 }
 
+#define __GTK_IMAGE_MENU_ITEM_C__
+#include "gtkaliasdef.c"
index 2cefa4113f71070257ee64a417a18e8b1bdbd5ac..f70df311a81cab443b91ba56a92932c1f4f692ca 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GTK_MENU_IMAGE_ITEM_H__
-#define __GTK_MENU_IMAGE_ITEM_H__
+#ifndef __GTK_IMAGE_MENU_ITEM_H__
+#define __GTK_IMAGE_MENU_ITEM_H__
 
 
 #include <gdk/gdk.h>
 #include <gtk/gtkmenuitem.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_IMAGE_MENU_ITEM            (gtk_image_menu_item_get_type ())
 #define GTK_IMAGE_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItem))
@@ -72,10 +68,6 @@ void       gtk_image_menu_item_set_image         (GtkImageMenuItem *image_menu_i
                                                   GtkWidget        *image);
 GtkWidget* gtk_image_menu_item_get_image         (GtkImageMenuItem *image_menu_item);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_IMAGE_MENU_ITEM_H__ */
index 3f993cfa401761c1d5c01c5605e99841cece6f01..d00eff7c0c194418d34b11c4ad651bf41694923b 100644 (file)
 
 #include <config.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtkimcontext.h"
 #include "gtkmain.h"           /* For _gtk_boolean_handled_accumulator */
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 enum {
   PREEDIT_START,
@@ -554,3 +554,5 @@ gtk_im_context_delete_surrounding (GtkIMContext *context,
   return result;
 }
 
+#define __GTK_IM_CONTEXT_C__
+#include "gtkaliasdef.c"
index 4ca114bcbff1ccd9a59a217b9d2f7be40aca943e..ae4a71072a69e9bf28d32534878934e648e7c97f 100644 (file)
 #include <gtk/gtkobject.h>
 #include <pango/pango.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_IM_CONTEXT              (gtk_im_context_get_type ())
 #define GTK_IM_CONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext))
@@ -123,9 +120,6 @@ gboolean gtk_im_context_delete_surrounding  (GtkIMContext   *context,
                                             gint            offset,
                                             gint            n_chars);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_IM_CONTEXT_H__ */
index 38a745756b8f291bd379eb68173561586b8ffc20..f104909249def7c676703acea95821f2b59fcb6b 100644 (file)
@@ -21,9 +21,9 @@
 #include <stdlib.h>
 
 #include <gdk/gdkkeysyms.h>
-#include "gtkalias.h"
 #include "gtkaccelgroup.h"
 #include "gtkimcontextsimple.h"
+#include "gtkalias.h"
 
 typedef struct _GtkComposeTable GtkComposeTable;
 
@@ -1504,3 +1504,5 @@ gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
   context_simple->tables = g_slist_prepend (context_simple->tables, table);
 }
 
+#define __GTK_IM_CONTEXT_SIMPLE_C__
+#include "gtkaliasdef.c"
index 7de9133f7e8b7a1b00c408f7b5725aa9fd8ef906..a40744aff92a674ceade0ed01120b3277ad89c6a 100644 (file)
 #include <glib/gstdio.h>
 #include <gmodule.h>
 #include <pango/pango-utils.h>
-#include "gtkalias.h"
 #include "gtkimmodule.h"
 #include "gtkimcontextsimple.h"
 #include "gtkrc.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 /* Do *not* include "gtkprivate.h" in this file. If you do, the
  * correct_libdir_prefix() function below will have to move somewhere
index bf03589b75b8357c58ba8fe962b0b50f45ea1a14..414d67ed22e1f7786174b24e28433ee86b5d647b 100644 (file)
 #include <string.h>
 #include <locale.h>
 
-#include "gtkalias.h"
 #include "gtkimmulticontext.h"
 #include "gtkimmodule.h"
 #include "gtkmain.h"
 #include "gtkradiomenuitem.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
+#include "gtkalias.h"
 
 struct _GtkIMMulticontextPrivate
 {
@@ -567,3 +567,5 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
   g_free (contexts);
 }
 
+#define __GTK_IM_MULTICONTEXT_C__
+#include "gtkaliasdef.c"
index 348d04b9dfd986db691960e6c7cc936cd4ca4ed7..d80b81d650be9bb71e12aa956469fbf30e8be965 100644 (file)
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtkmenushell.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_IM_MULTICONTEXT              (gtk_im_multicontext_get_type ())
 #define GTK_IM_MULTICONTEXT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontext))
@@ -68,9 +65,6 @@ GtkIMContext *gtk_im_multicontext_new      (void);
 void          gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
                                                    GtkMenuShell      *menushell);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_IM_MULTICONTEXT_H__ */
index 6651303f8137a16d664a9d080b6cdd7d0cdc189b..b936ee12ada8cb44b65f714587482986dd4d5156 100644 (file)
@@ -35,7 +35,6 @@
 #include <config.h>
 #include <glib/gprintf.h>
 #include <stdlib.h>
-#include "gtkalias.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkbutton.h"
 #include "gtkentry.h"
@@ -59,6 +58,7 @@
 #define GTK_DISABLE_DEPRECATED
 
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 typedef struct _GtkInputDialogPrivate GtkInputDialogPrivate;
 typedef struct _GtkInputKeyInfo       GtkInputKeyInfo;
@@ -768,3 +768,6 @@ gtk_input_dialog_fill_keys(GtkInputDialog *inputd, GdkDevice *info)
                                info->keys[i].modifiers);
     }
 }
+
+#define __GTK_INPUTDIALOG_C__
+#include "gtkaliasdef.c"
index e3862407226b7480c6fabec89430392c34039af2..1a1a648994508147fe87e525a48a74efa27cf19f 100644 (file)
 #include <gtk/gtkdialog.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_INPUT_DIALOG              (gtk_input_dialog_get_type ())
 #define GTK_INPUT_DIALOG(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_INPUT_DIALOG, GtkInputDialog))
@@ -97,9 +94,6 @@ GType      gtk_input_dialog_get_type     (void) G_GNUC_CONST;
 GtkWidget* gtk_input_dialog_new          (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_INPUTDIALOG_H__ */
index 184a4e1dd78c31d2d4af61ff07eb1850addcc210..dc1f1d2612edc48dd1c3fb8a898b42581b4a7dc6 100644 (file)
@@ -26,9 +26,9 @@
 
 #include <config.h>
 #include <gdk/gdk.h>
-#include "gtkalias.h"
 #include "gtkinvisible.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -348,3 +348,5 @@ gtk_invisible_constructor (GType                  type,
   return object;
 }
 
+#define __GTK_INVISIBLE_C__
+#include "gtkaliasdef.c"
index d645c7aa55641ef7f4af238bbb940d90c894fd14..2a822090d6acbdb9bce82e8751699958f6843fe6 100644 (file)
@@ -25,9 +25,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkitem.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 
 enum {
@@ -202,3 +202,5 @@ gtk_item_leave (GtkWidget        *widget,
   return gtk_widget_event (widget->parent, (GdkEvent*) event);
 }
 
+#define __GTK_ITEM_C__
+#include "gtkaliasdef.c"
index 0cd5fb5e5e426ed505cecb37398bfb0cd1df4936..01ca95c190fa8db0f28368d0fc22d45c82d306cb 100644 (file)
 #include <gtk/gtkbin.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ITEM                  (gtk_item_get_type ())
 #define GTK_ITEM(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ITEM, GtkItem))
@@ -74,10 +71,6 @@ void  gtk_item_select   (GtkItem *item);
 void  gtk_item_deselect (GtkItem *item);
 void  gtk_item_toggle   (GtkItem *item);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_ITEM_H__ */
index bec6ab67391d7e14a3528f2d1bbb931fde63cf77..8f24aaca515a6a7ce54560825e05f71cb6d77ae9 100644 (file)
@@ -29,7 +29,6 @@
 
 #include       <config.h>
 
-#include       "gtkalias.h"
 #include       "gtkitemfactory.h"
 #include       "gtk/gtkmenubar.h"
 #include       "gtk/gtkmenu.h"
@@ -54,6 +53,7 @@
 #undef GTK_DISABLE_DEPRECATED
 #include       "gtk/gtkoptionmenu.h"
 #define GTK_DISABLE_DEPRECATED
+#include       "gtkalias.h"
 
 /* --- defines --- */
 #define                ITEM_FACTORY_STRING     ((gchar*) item_factory_string)
@@ -1598,3 +1598,6 @@ gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,
   ifactory->translate_data = data;
   ifactory->translate_notify = notify;
 }
+
+#define __GTK_ITEM_FACTORY_C__
+#include "gtkaliasdef.c"
index 9d13df470756f83106c4351c94338a36dfbd5bda..5cae6892a719b930909ebbe185673ffa3376d9c8 100644 (file)
 
 #include <gtk/gtkwidget.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef gchar * (*GtkTranslateFunc)       (const gchar         *path,
                                            gpointer             func_data);
@@ -237,10 +234,7 @@ void       gtk_item_factories_path_delete     (const gchar         *ifactory_path,
 #endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_ITEM_FACTORY_H__ */
 
index 9d4e41b71c9815af8dad5213d81787724c39f155..2741545081793564b94cb48f90bdac4b68c5f9da 100644 (file)
@@ -19,9 +19,9 @@
  * Boston, MA 02111-1307, USA.
  */
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkdebug.h"
 #include "gtkkeyhash.h"
+#include "gtkalias.h"
 
 typedef struct _GtkKeyHashEntry GtkKeyHashEntry;
 
index f5ba61617209dce5f96c52f0d0685009c1e89de8..ecfb9682dfa462ed252c258fce43bf72e5fb2347 100644 (file)
@@ -26,7 +26,6 @@
 #include <config.h>
 #include <math.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtklabel.h"
 #include "gtkdnd.h"
 #include "gtkmain.h"
@@ -42,6 +41,7 @@
 #include "gtknotebook.h"
 #include "gtkstock.h"
 #include "gtkbindings.h"
+#include "gtkalias.h"
 
 #define GTK_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_LABEL, GtkLabelPrivate))
 
@@ -3951,3 +3951,6 @@ gtk_label_do_popup (GtkLabel       *label,
                     popup_position_func, label,
                     0, gtk_get_current_event_time ());
 }
+
+#define __GTK_LABEL_C__
+#include "gtkaliasdef.c"
index b02f99bead0128a70b47e070f9d379cd6aa9ffe1..e8c6309fbf426728db3fe5b01a67798007964737 100644 (file)
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkmenu.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_LABEL           (gtk_label_get_type ())
 #define GTK_LABEL(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LABEL, GtkLabel))
@@ -180,9 +177,6 @@ guint gtk_label_parse_uline            (GtkLabel    *label,
 
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_LABEL_H__ */
index 12c44e6d83926996c038172dd6860ecad2755f3f..b47ff7f674b050180a5dd352e4d685968a15e2b3 100644 (file)
 #include <config.h>
 #include "gdkconfig.h"
 
-#include "gtkalias.h"
 #include "gtklayout.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 typedef struct _GtkLayoutChild   GtkLayoutChild;
 
@@ -1157,3 +1157,6 @@ gtk_layout_adjustment_changed (GtkAdjustment *adjustment,
       gdk_window_process_updates (layout->bin_window, TRUE);
     }
 }
+
+#define __GTK_LAYOUT_C__
+#include "gtkaliasdef.c"
index fbe4b50819f4ab912710e519cacc261bdcf89ec0..ffd8b45daa271e1d3e0a4746d634d12443da5176 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GTK_LAYOUT_H
-#define __GTK_LAYOUT_H
+#ifndef __GTK_LAYOUT_H__
+#define __GTK_LAYOUT_H__
 
 #include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_LAYOUT            (gtk_layout_get_type ())
 #define GTK_LAYOUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LAYOUT, GtkLayout))
@@ -130,8 +127,6 @@ void           gtk_layout_freeze          (GtkLayout     *layout);
 void           gtk_layout_thaw            (GtkLayout     *layout);
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* __GTK_LAYOUT_H */
+#endif /* __GTK_LAYOUT_H__ */
index c00875fd08e91f0c1be9758b7e1169b82d04a8e9..45f35107e9a857bf25139b43f8ab9c768cdfd128 100644 (file)
 #include <config.h>
 #include <string.h> /* memset */
 
-#include "gtkalias.h"
 #include "gtklist.h"
 #include "gtklistitem.h"
 #include "gtkmain.h"
 #include "gtksignal.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 enum {
   SELECTION_CHANGED,
@@ -2618,3 +2618,6 @@ gtk_list_drag_begin (GtkWidget      *widget,
        }
     }
 }
+
+#define __GTK_LIST_C__
+#include "gtkaliasdef.c"
index e4e15bd94b3dca86124509ed2ad3c0471af5dd2c..4023f2e74dfe3b707485cb0c328885a13e0755aa 100644 (file)
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtklistitem.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_LIST                  (gtk_list_get_type ())
 #define GTK_LIST(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_LIST, GtkList))
@@ -138,10 +135,7 @@ void       gtk_list_toggle_row            (GtkList          *list,
 void       gtk_list_undo_selection        (GtkList          *list);
 void       gtk_list_end_drag_selection    (GtkList          *list);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_LIST_H__ */
 
index 5dec3c2cdb3dc2008ce8c01f44c8722f8e2b48b9..6edd09c1fec4eec307032c9f94a8d6f26235a434 100644 (file)
@@ -27,7 +27,6 @@
 #undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkbindings.h"
 #include "gtklabel.h"
 #include "gtklistitem.h"
@@ -35,6 +34,7 @@
 #include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include <gdk/gdkkeysyms.h>
+#include "gtkalias.h"
 
 
 enum
@@ -624,3 +624,6 @@ gtk_real_list_item_toggle (GtkItem *item)
       break;
     }
 }
+
+#define __GTK_LIST_ITEM_C__
+#include "gtkaliasdef.c"
index 36cb4cc4a33f3cb255a17f53388a19b22e860415..5a061852175a90342c6899ce44bc692fa851ffe0 100644 (file)
 #include <config.h>
 #include <string.h>
 #include <gobject/gvaluecollector.h>
-#include "gtkalias.h"
 #include "gtktreemodel.h"
 #include "gtkliststore.h"
 #include "gtktreedatalist.h"
 #include "gtktreednd.h"
 #include "gtksequence.h"
+#include "gtkalias.h"
 
 #define GTK_LIST_STORE_IS_SORTED(list) (GTK_LIST_STORE (list)->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
 #define VALID_ITER(iter, list_store) ((iter)!= NULL && (iter)->user_data != NULL && list_store->stamp == (iter)->stamp && !_gtk_sequence_ptr_is_end ((iter)->user_data) && _gtk_sequence_ptr_get_sequence ((iter)->user_data) == list_store->seq)
@@ -2077,3 +2077,6 @@ gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
   gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
   gtk_tree_path_free (path);
 }
+
+#define __GTK_LIST_STORE_C__
+#include "gtkaliasdef.c"
index 1a47111308e22b16a649baea9e575fb0c18340e4..f47f1eb3ff2e8c79a50a6b8138039ec5ac5f5e14 100644 (file)
@@ -51,7 +51,6 @@
 
 #include <pango/pango-types.h> /* For pango_language_from_string */
 
-#include "gtkalias.h"
 #include "gtkintl.h"
 
 #include "gtkaccelmap.h"
@@ -68,6 +67,7 @@
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkdebug.h"
+#include "gtkalias.h"
 
 /* Private type definitions
  */
@@ -2287,3 +2287,6 @@ _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
   
   return continue_emission;
 }
+
+#define __GTK_MAIN_C__
+#include "gtkaliasdef.c"
index 150c10a0e5d184d96fd0c94de37ff75ea43bc9c6..9e92d607079b288873d73b97f240d0b60d9ee168 100644 (file)
@@ -35,9 +35,7 @@
 #include <gtk/gtkwindow.h>
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Priorities for redrawing and resizing
  */
@@ -223,9 +221,6 @@ gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
 
 gchar *_gtk_get_lc_ctype (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_MAIN_H__ */
index 1f2d9d13ce35c885c9052066fc0616613474df5f..36eafd017c77c01b4847a2c852816f8649f7dc24 100644 (file)
@@ -29,7 +29,6 @@
 #include <config.h>
 #include <string.h> /* memset */
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 #include "gtkaccellabel.h"
 #include "gtkaccelmap.h"
 #include "gtkbindings.h"
@@ -44,6 +43,7 @@
 #include "gtkvscrollbar.h"
 #include "gtksettings.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 #define MENU_ITEM_CLASS(w)   GTK_MENU_ITEM_GET_CLASS (w)
@@ -4384,3 +4384,5 @@ gtk_menu_get_for_attach_widget (GtkWidget *widget)
   return list;
 }
 
+#define __GTK_MENU_C__
+#include "gtkaliasdef.c"
index f1104c87e8f376efdb3ab10f20c97c1460c853d6..ba4c8013d476cfa11eb2f43a9e64417ad92585ff 100644 (file)
@@ -33,9 +33,7 @@
 #include <gtk/gtkmenushell.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_MENU                  (gtk_menu_get_type ())
 #define GTK_MENU(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU, GtkMenu))
@@ -206,9 +204,6 @@ GList*     gtk_menu_get_for_attach_widget (GtkWidget           *widget);
 #define gtk_menu_insert(menu,child,pos)        gtk_menu_shell_insert ((GtkMenuShell *)(menu),(child),(pos))
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_MENU_H__ */
index f52d00ecfb1ba952727df7df0fb1c62a034989eb..235551c55f6a5129ff8298ece62a9eabe66b2f52 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <config.h>
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 #include "gtkbindings.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
@@ -37,6 +36,7 @@
 #include "gtksettings.h"
 #include "gtkintl.h"
 #include "gtkwindow.h"
+#include "gtkalias.h"
 
 
 #define BORDER_SPACING  0
@@ -955,3 +955,6 @@ void gtk_menu_bar_set_child_pack_direction (GtkMenuBar       *menubar,
       g_object_notify (G_OBJECT (menubar), "child-pack-direction");
     }
 }
+
+#define __GTK_MENU_BAR_C__
+#include "gtkaliasdef.c"
index 371f880353940b171c75cab7e94d5d8bab3f07ec..b867b3af9658a7556e244be057c3dc267d9c8198 100644 (file)
@@ -29,7 +29,6 @@
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkaccellabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
@@ -37,6 +36,7 @@
 #include "gtkmenubar.h"
 #include "gtkmenuitem.h"
 #include "gtkseparatormenuitem.h"
+#include "gtkalias.h"
 
 #define MENU_ITEM_CLASS(w)  GTK_MENU_ITEM_CLASS (GTK_OBJECT (w)->klass)
 
@@ -1457,3 +1457,6 @@ _gtk_menu_item_is_selectable (GtkWidget *menu_item)
 
   return TRUE;
 }
+
+#define __GTK_MENU_ITEM_C__
+#include "gtkaliasdef.c"
index 930d4eed0a727cf75cfd2787e5c36235758c37de..0d7a42e9ded27ca1b647cb0a0f4abbd47ed6181d 100644 (file)
 #include <gtk/gtkitem.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define        GTK_TYPE_MENU_ITEM              (gtk_menu_item_get_type ())
 #define GTK_MENU_ITEM(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItem))
@@ -127,9 +124,6 @@ void      _gtk_menu_item_popup_submenu        (GtkWidget           *menu_item);
 #define gtk_menu_item_right_justify(menu_item) gtk_menu_item_set_right_justified ((menu_item), TRUE)
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_MENU_ITEM_H__ */
index 248053334a425936a2ac6b9f6e20c409d3e93683..f2986ddedea82b64100c0d9f6a824d2e47dc116f 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <config.h>
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 #include "gtkbindings.h"
 #include "gtkkeyhash.h"
 #include "gtkmain.h"
@@ -39,6 +38,7 @@
 #include "gtkmnemonichash.h"
 #include "gtktearoffmenuitem.h"
 #include "gtkwindow.h"
+#include "gtkalias.h"
 
 #define MENU_SHELL_TIMEOUT   500
 
@@ -1388,3 +1388,5 @@ _gtk_menu_shell_remove_mnemonic (GtkMenuShell *menu_shell,
   gtk_menu_shell_reset_key_hash (menu_shell);
 }
 
+#define __GTK_MENU_SHELL_C__
+#include "gtkaliasdef.c"
index 499fc3175cd97a7c65655ba40b3ce0edccba8752..a0b48f4317baad6ebeb71c8789fcaf57b505df31 100644 (file)
 #include <gtk/gtkcontainer.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define        GTK_TYPE_MENU_SHELL             (gtk_menu_shell_get_type ())
 #define GTK_MENU_SHELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShell))
@@ -125,9 +122,6 @@ void _gtk_menu_shell_remove_mnemonic (GtkMenuShell *menu_shell,
                                      guint         keyval,
                                      GtkWidget    *target);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_MENU_SHELL_H__ */
index 7881d99d7549006b81c0e2bebfdbe75eef5c51c0..745127a32608a171ff51894b0c1a449f07eeb1b9 100644 (file)
@@ -20,7 +20,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkmenutoolbutton.h"
 #include "gtkintl.h"
 #include "gtktogglebutton.h"
@@ -29,6 +28,7 @@
 #include "gtkvbox.h"
 #include "gtkmenu.h"
 #include "gtkmain.h"
+#include "gtkalias.h"
 
 
 #define GTK_MENU_TOOL_BUTTON_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonPrivate))
@@ -621,3 +621,5 @@ gtk_menu_tool_button_set_arrow_tooltip (GtkMenuToolButton *button,
   gtk_tooltips_set_tip (tooltips, button->priv->arrow_button, tip_text, tip_private);
 }
 
+#define __GTK_MENU_TOOL_BUTTON_C__
+#include "gtkaliasdef.c"
index fdb1024a520e568d95d61248c91836c8f301c00a..ca5ad21c74f90b01486dec3dc2785f4bc373c83b 100644 (file)
@@ -26,7 +26,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkmessagedialog.h"
 #include "gtklabel.h"
 #include "gtkhbox.h"
@@ -36,6 +35,7 @@
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include <string.h>
+#include "gtkalias.h"
 
 #define GTK_MESSAGE_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogPrivate))
 
@@ -727,3 +727,6 @@ gtk_message_dialog_style_set (GtkWidget *widget,
   if (GTK_WIDGET_CLASS (parent_class)->style_set)
     (GTK_WIDGET_CLASS (parent_class)->style_set) (widget, prev_style);
 }
+
+#define __GTK_MESSAGE_DIALOG_C__
+#include "gtkaliasdef.c"
index fc3f6d39f63a63d8cc57e2a8fef7cf5ebf6ee70f..3d81dbbce09faa2111253429ce24db8ca3cf2208 100644 (file)
@@ -30,9 +30,7 @@
 
 #include <gtk/gtkdialog.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum
 {
@@ -110,8 +108,6 @@ void       gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message
                                                        const gchar      *message_format,
                                                        ...) G_GNUC_PRINTF (2, 3);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_MESSAGE_DIALOG_H__ */
index b65382961f49f0f1dee16636ae804a4be43b874c..7abb87337e6d217d5257b5172c0af061037e5da5 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkcontainer.h"
 #include "gtkmisc.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 enum {
@@ -366,3 +366,6 @@ gtk_misc_realize (GtkWidget *widget)
       gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
     }
 }
+
+#define __GTK_MISC_C__
+#include "gtkaliasdef.c"
index 198135ba874f65eb0a7c47be8aa04f3aa70369e8..3bc638ae9fdcce37cecb391694b83fabb01c9f4c 100644 (file)
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_MISC                 (gtk_misc_get_type ())
 #define GTK_MISC(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MISC, GtkMisc))
@@ -80,9 +77,6 @@ void    gtk_misc_get_padding   (GtkMisc *misc,
                                gint    *ypad);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_MISC_H__ */
index ca05d6e119a771b7b8e48334d204eb163991276c..9a825de359dbb7d9bcbada6eedad0ef075829bdb 100644 (file)
@@ -25,7 +25,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtknotebook.h"
 #include "gtkmain.h"
 #include "gtkmenu.h"
@@ -36,6 +35,7 @@
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkbindings.h"
+#include "gtkalias.h"
 
 
 #define TAB_OVERLAP    2
@@ -5436,3 +5436,6 @@ gtk_notebook_reorder_child (GtkNotebook *notebook,
 
   gtk_widget_thaw_child_notify (child);
 }
+
+#define __GTK_NOTEBOOK_C__
+#include "gtkaliasdef.c"
index 1879145eebc773ae55c5586820b32b58c56af965..2482bbd8b78a59c35fede75f9c6410afb2dbae3e 100644 (file)
 #include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_NOTEBOOK                  (gtk_notebook_get_type ())
 #define GTK_NOTEBOOK(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_NOTEBOOK, GtkNotebook))
@@ -242,9 +238,6 @@ void gtk_notebook_reorder_child           (GtkNotebook *notebook,
 #define gtk_notebook_set_page                   gtk_notebook_set_current_page
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_NOTEBOOK_H__ */
index 63cb73867aa26e8168d91d3240dc547ce6874562..e2e2b733e655bb3cfc87ecbc1c265cf93ad429f9 100644 (file)
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
-#include "gtkalias.h"
 #include "gtkobject.h"
 #include "gtkmarshalers.h"
 #include "gtksignal.h"
+#include "gtkalias.h"
 
 
 enum {
@@ -744,3 +744,6 @@ gtk_object_unref (GtkObject *object)
 
   g_object_unref ((GObject*) object);
 }
+
+#define __GTK_OBJECT_C__
+#include "gtkaliasdef.c"
index 31150978dbe89dccad3a8ff96dfdc4f6e86c6e3d..24598c8bf361d3996b87eb9b1cae6e5faf8bedda 100644 (file)
 #include <string.h>
 #include "gdk/gdkkeysyms.h"
 #include "gdk/gdki18n.h"
-#include "gtkalias.h"
 #include "gtkclipboard.h"
 #include "gtkoldeditable.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkselection.h"
 #include "gtksignal.h"
+#include "gtkalias.h"
 
 #define MIN_EDITABLE_WIDTH  150
 #define DRAW_TIMEOUT     20
@@ -846,3 +846,6 @@ gtk_old_editable_changed (GtkOldEditable *old_editable)
   
   g_signal_emit_by_name (old_editable, "changed");
 }
+
+#define __GTK_OLD_EDITABLE_C__
+#include "gtkaliasdef.c"
index d5983d9e299bba7b5510312463eb6849eb1fa1fa..da6d90c3680bc6cebf2176f48b3b0fca1b68321c 100644 (file)
 #include <gtk/gtkeditable.h>
 #include <gtk/gtkwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_OLD_EDITABLE            (gtk_old_editable_get_type ())
 #define GTK_OLD_EDITABLE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_OLD_EDITABLE, GtkOldEditable))
@@ -124,10 +121,7 @@ void       gtk_old_editable_claim_selection (GtkOldEditable *old_editable,
                                             guint32         time_);
 void       gtk_old_editable_changed         (GtkOldEditable *old_editable);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_OLD_EDITABLE_H__ */
 
index 9791a7ff569b7780dc1492cc5f827fdeea5b61ea..fb4dd65a4d33b81a18726734b6c5b067f3eff875 100644 (file)
@@ -25,7 +25,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkintl.h"
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
@@ -36,6 +35,8 @@
 #include "gtkoptionmenu.h"
 #define GTK_DISABLE_DEPRECATED
 
+#include "gtkalias.h"
+
 #define CHILD_LEFT_SPACING        4
 #define CHILD_RIGHT_SPACING       1
 #define CHILD_TOP_SPACING         1
@@ -1061,3 +1062,6 @@ gtk_option_menu_scroll_event (GtkWidget          *widget,
   return TRUE;
 }
 
+#define __GTK_OPTION_MENU_C__
+#include "gtkaliasdef.c"
+
index 41d4d9c482bfa30420b5e963359f49e592502869..32f6de9f03b5cbe7a0078cedb95e3b0e6fe6d024 100644 (file)
 #include <gtk/gtkbutton.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_OPTION_MENU              (gtk_option_menu_get_type ())
 #define GTK_OPTION_MENU(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_OPTION_MENU, GtkOptionMenu))
@@ -86,10 +83,7 @@ void       gtk_option_menu_set_history (GtkOptionMenu *option_menu,
                                        guint          index_);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_OPTION_MENU_H__ */
 
index f7870af296d51b33197692df89550aafcdad290f..8e22df9e2c5e05524da633a7c4200d2a2b344ba7 100644 (file)
@@ -25,7 +25,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkintl.h"
 #include "gtkpaned.h"
 #include "gtkbindings.h"
@@ -34,6 +33,7 @@
 #include "gtkwindow.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -1796,3 +1796,6 @@ gtk_paned_toggle_handle_focus (GtkPaned *paned)
 
   return FALSE;
 }
+
+#define __GTK_PANED_C__
+#include "gtkaliasdef.c"
index b79781522da631dba60629376a723abee9ac2b06..003316aef73de822be9d46fc24975c896ccea343 100644 (file)
 
 #include <gtk/gtkcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_PANED                  (gtk_paned_get_type ())
 #define GTK_PANED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED, GtkPaned))
@@ -138,8 +135,6 @@ void    gtk_paned_compute_position (GtkPaned  *paned,
 #define        gtk_paned_set_gutter_size(p,s)          (void) 0
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_PANED_H__ */
index 737cfc3f3b5219181b9913aa2d1269e5e8900454..f6dbb02c571569153245b41110c2f5783d19d5bc 100644 (file)
@@ -19,7 +19,6 @@
 
 #include <config.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtkpathbar.h"
 #include "gtktogglebutton.h"
 #include "gtkalignment.h"
@@ -33,6 +32,7 @@
 #include "gtkhbox.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 enum {
   PATH_CLICKED,
index dd80685a82da59232b8940af17925b85ad9cc86b..63caf65d13a1b24f939885f0d1cb9e72345e8117 100644 (file)
@@ -32,9 +32,9 @@
 
 #include <config.h>
 #include <math.h>
-#include "gtkalias.h"
 #include "gtkcontainer.h"
 #include "gtkpixmap.h"
+#include "gtkalias.h"
 
 
 static void gtk_pixmap_class_init (GtkPixmapClass  *klass);
@@ -306,4 +306,5 @@ build_insensitive_pixmap (GtkPixmap *gtkpixmap)
   g_object_unref (G_OBJECT (stated));
 }
 
-
+#define __GTK_PIXMAP_C__
+#include "gtkaliasdef.c"
index f9e058de4806425bc446893145a8fad6bb7462f8..1bb4f8543416e2e72085da6f85a87e79e93dc105 100644 (file)
 #include <gtk/gtkmisc.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_PIXMAP                         (gtk_pixmap_get_type ())
 #define GTK_PIXMAP(obj)                         (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP, GtkPixmap))
@@ -81,10 +78,7 @@ void       gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap,
                                             gboolean   build);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_PIXMAP_H__ */
 
index 178b344ebeeafe7ab708eae2b32079ae6fac8214..45f06e0337e0c241d2cda66d63b8ef6432db4c02 100644 (file)
@@ -25,7 +25,6 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkplug.h"
@@ -36,6 +35,8 @@
 
 #include "gtkxembed.h"
 
+#include "gtkalias.h"
+
 static void            gtk_plug_class_init            (GtkPlugClass     *klass);
 static void            gtk_plug_init                  (GtkPlug          *plug);
 static void            gtk_plug_finalize              (GObject          *object);
@@ -1138,3 +1139,6 @@ gtk_plug_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 
   return GDK_FILTER_CONTINUE;
 }
+
+#define __GTK_PLUG_C__
+#include "gtkaliasdef.c"
index 20df3eaa304c983cdcbdb8e4f62142f18579fd74..87fe6f92fd4e046d50092cec07a23718eb1939e8 100644 (file)
 #include <gtk/gtkwindow.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_PLUG            (gtk_plug_get_type ())
 #define GTK_PLUG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PLUG, GtkPlug))
@@ -96,9 +93,6 @@ void _gtk_plug_add_to_socket      (GtkPlug   *plug,
 void _gtk_plug_remove_from_socket (GtkPlug   *plug,
                                   GtkSocket *socket_);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_PLUG_H__ */
index 32eb5aaae5427ddb3ffe51ed444a84fb7343ab32..c26d463565f982e25a7b58810a0ee69e288e0f71 100644 (file)
 #include <sys/param.h>
 #endif
 #include "gdk/gdkrgb.h"
-#include "gtkalias.h"
 #include "gtkpreview.h"
 #include "gtksignal.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 #define PREVIEW_CLASS(w)      GTK_PREVIEW_CLASS (GTK_OBJECT (w)->klass)
@@ -611,3 +611,6 @@ gtk_fill_lookup_array (guchar *array)
       array[i] = val;
     }
 }
+
+#define __GTK_PREVIEW_C__
+#include "gtkaliasdef.c"
index d8df2f42c6176aac88996f021204c54405fa4c1b..515e6d8a2b25ac3e44a68aa596284231d1635bcf 100644 (file)
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_PREVIEW            (gtk_preview_get_type ())
 #define GTK_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_PREVIEW, GtkPreview))
@@ -136,10 +133,7 @@ GtkPreviewInfo* gtk_preview_get_info           (void);
 void            gtk_preview_reset              (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_PREVIEW_H__ */
 
index b183f0d5d091b8d65533429520ec9ca1fd58e345..093816d317ef62e12dc4d4cfdea21697682d901c 100644 (file)
@@ -28,9 +28,9 @@
 #include <glib/gprintf.h>
 #include <math.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtkprogress.h" 
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define EPSILON  1e-5
 #define DEFAULT_FORMAT "%P %%"
@@ -754,3 +754,6 @@ gtk_progress_set_activity_mode (GtkProgress *progress,
       g_object_notify (G_OBJECT (progress), "activity_mode");
     }
 }
+
+#define __GTK_PROGRESS_C__
+#include "gtkaliasdef.c"
index 57c9aac66bb9901a5aeba57f4c20e617767cdb17..4b25942426957ffb2f6f0855424948520da0366d 100644 (file)
@@ -33,9 +33,7 @@
 #include <gtk/gtkadjustment.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 
@@ -118,9 +116,6 @@ gdouble    gtk_progress_get_percentage_from_value (GtkProgress *progress,
 
 #endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_PROGRESS_H__ */
index 1ba4cbf5a373d8c6fd949032a595feb60698d19b..03ca701aa0c665d54bdc2ecb0a976f1f076e6208 100644 (file)
@@ -34,9 +34,9 @@
 #  include <stdio.h>
 #endif
 
-#include "gtkalias.h"
 #include "gtkprogressbar.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 #define MIN_HORIZONTAL_BAR_WIDTH   150
@@ -1271,3 +1271,5 @@ gtk_progress_bar_get_ellipsize (GtkProgressBar *pbar)
   return pbar->ellipsize;
 }
 
+#define __GTK_PROGRESS_BAR_C__
+#include "gtkaliasdef.c"
index 49eb9c46a371686344ad848c9564e7d252f7af1c..2eb3360c18801f7d5efcdffcb4130f672c552aee 100644 (file)
 #include <gtk/gtkprogress.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_PROGRESS_BAR            (gtk_progress_bar_get_type ())
 #define GTK_PROGRESS_BAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBar))
@@ -166,9 +163,6 @@ void       gtk_progress_bar_update               (GtkProgressBar *pbar,
 
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_PROGRESS_BAR_H__ */
index bdf6d302e55a7f01f6e6c346e0c7b14eea61f6ce..ad078df2e139e45865bf127434487cb0641e5442 100644 (file)
 
 #include <config.h>
 
-#include "gtkalias.h"
 #include "gtkradioaction.h"
 #include "gtkradiomenuitem.h"
 #include "gtktoggleactionprivate.h"
 #include "gtktoggletoolbutton.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define GTK_RADIO_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_RADIO_ACTION, GtkRadioActionPrivate))
 
@@ -485,3 +485,6 @@ gtk_radio_action_get_current_value (GtkRadioAction *action)
 
   return action->private_data->value;
 }
+
+#define __GTK_RADIO_ACTION_C__
+#include "gtkaliasdef.c"
index e4ab2af43072873ba41f65180bf75bb5e7e70042..b33b9085497a1d4fc38db9e96d44f07f9448c797 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkradiobutton.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 enum {
@@ -740,3 +740,6 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
                        x, y, indicator_size, indicator_size);
     }
 }
+
+#define __GTK_RADIO_BUTTON_C__
+#include "gtkaliasdef.c"
index c5264c58a35eab767f35ca19d73a6775e5b27ceb..6f7ce3a1efbf00c1efdb5dd5d0cbebcc461ae2d6 100644 (file)
 #include <gtk/gtkcheckbutton.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_RADIO_BUTTON                 (gtk_radio_button_get_type ())
 #define GTK_RADIO_BUTTON(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButton))
@@ -89,9 +86,6 @@ void       gtk_radio_button_set_group                     (GtkRadioButton *radio
 #define gtk_radio_button_group gtk_radio_button_get_group
 #endif
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_RADIO_BUTTON_H__ */
index a9ddcf14babfac77f0a3a9411ebced9960a38686..9aef29f159c557da8bc55393793532808809a0df 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkaccellabel.h"
 #include "gtkmarshalers.h"
 #include "gtkradiomenuitem.h"
+#include "gtkalias.h"
 
 
 static void gtk_radio_menu_item_class_init     (GtkRadioMenuItemClass *klass);
@@ -434,3 +434,6 @@ gtk_radio_menu_item_activate (GtkMenuItem *menu_item)
 
   gtk_widget_queue_draw (GTK_WIDGET (radio_menu_item));
 }
+
+#define __GTK_RADIO_MENU_ITEM_C__
+#include "gtkaliasdef.c"
index 0bdf033326997a71a603a7e260dcfef80ae12b72..cd6a756878e1b311a27ae391b53a1d8114a68f6c 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkradiotoolbutton.h"
 #include "gtkradiobutton.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -279,3 +279,5 @@ gtk_radio_tool_button_set_group (GtkRadioToolButton *button,
   gtk_radio_button_set_group (get_radio_button (button), group);
 }
 
+#define __GTK_RADIO_TOOL_BUTTON_C__
+#include "gtkaliasdef.c"
index d31a6d181d5f39f46a7fb339c340621ea2d6cc3a..47052c8e7d117db5331c4c0baa4a3972521e20ee 100644 (file)
 #include <config.h>
 #include <stdio.h>
 #include <math.h>
-#include "gtkalias.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkrange.h"
 #include "gtkintl.h"
 #include "gtkscrollbar.h"
+#include "gtkalias.h"
 
 #define SCROLL_INITIAL_DELAY 250  /* must hold button this long before ... */
 #define SCROLL_LATER_DELAY   100  /* ... it starts repeating at this rate  */
@@ -2544,3 +2544,6 @@ gtk_range_remove_update_timer (GtkRange *range)
       range->update_timeout_id = 0;
     }
 }
+
+#define __GTK_RANGE_C__
+#include "gtkaliasdef.c"
index a6c68c4f6db795905a3a727aa04f71cb4d42ee5b..0b83f71282bbd8f054b456afd6e23c3b35552af1 100644 (file)
@@ -18,9 +18,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkrbtree.h"
 #include "gtkdebug.h"
+#include "gtkalias.h"
 
 static void        _gtk_rbnode_validate_allocator (GAllocator *allocator);
 static GtkRBNode * _gtk_rbnode_new                (GtkRBTree  *tree,
index 0dd4a521977609563347dcee0342b7d50fcbf488..1953cd08443018eb4fc3100a55462476961b5509 100644 (file)
@@ -39,7 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "gtkalias.h"
 
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -57,6 +56,8 @@
 #include "gtksettings.h"
 #include "gtkwindow.h"
 
+#include "gtkalias.h"
+
 #ifdef G_OS_WIN32
 #include <io.h>
 #endif
@@ -3965,3 +3966,6 @@ gtk_rc_parse (const gchar *filename)
 }
 
 #endif
+
+#define __GTK_RC_C__
+#include "gtkaliasdef.c"
index 037eb927758560581a18c16080781ee2944de2b6..3fb2d0d3521dbade1e109c5519fff2a2e5c31531 100644 (file)
@@ -30,9 +30,7 @@
 
 #include <gtk/gtkstyle.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Forward declarations */
 typedef struct _GtkIconFactory  GtkIconFactory;
@@ -241,9 +239,6 @@ const GtkRcProperty* _gtk_rc_style_lookup_rc_property (GtkRcStyle *rc_style,
 
 const gchar* _gtk_rc_context_get_default_font_name (GtkSettings *settings);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_RC_H__ */
index 6c1370104ad48f7843865a13b26164f385bf1eaa..161c2b4113ea4aed652d7be2d082e857be06414d 100644 (file)
@@ -25,9 +25,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkruler.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -474,3 +474,6 @@ gtk_ruler_make_pixmap (GtkRuler *ruler)
       gdk_gc_set_exposures (ruler->non_gr_exp_gc, FALSE);
     }
 }
+
+#define __GTK_RULER_C__
+#include "gtkaliasdef.c"
index e0512ecb8b1921dc496475ba3da2b5b358a3ffdf..7b8fe529e9b73cb16dc31d3faf9778193fed8bcc 100644 (file)
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_RULER            (gtk_ruler_get_type ())
 #define GTK_RULER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RULER, GtkRuler))
@@ -126,9 +123,6 @@ void          gtk_ruler_get_range  (GtkRuler *ruler,
                                    gdouble  *position,
                                    gdouble  *max_size);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_RULER_H__ */
index 2a9150a4ab7f080ea20791c339de70208d7ad31b..fcded4b24ce4c8bea026c2bca89cb939d6b123ee 100644 (file)
 
 #include <config.h>
 #include <math.h>
-#include "gtkalias.h"
 #include "gtkintl.h"
 #include "gtkscale.h"
 #include "gtkmarshalers.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkbindings.h"
+#include "gtkalias.h"
 
 
 #define        MAX_DIGITS      (64)    /* don't change this,
@@ -748,3 +748,5 @@ void _gtk_scale_clear_layout (GtkScale *scale)
     }
 }
 
+#define __GTK_SCALE_C__
+#include "gtkaliasdef.c"
index 3623142519e432917182fe40a58bc66dc164c687..b249c290f9783307afa416b6ef8054f1a08c84c9 100644 (file)
 #include <gtk/gtkrange.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_SCALE            (gtk_scale_get_type ())
 #define GTK_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE, GtkScale))
@@ -100,9 +97,6 @@ gchar  *_gtk_scale_format_value    (GtkScale        *scale,
                                     gdouble          value);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_SCALE_H__ */
index e166f81fa9cc8e82c5b8251d18b323deb7160311..a7bfcaefb53c7b74a26d31923a26d1ef2b0ffd52 100644 (file)
@@ -26,9 +26,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkscrollbar.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 static void gtk_scrollbar_class_init (GtkScrollbarClass *klass);
 static void gtk_scrollbar_init       (GtkScrollbar      *scrollbar);
@@ -165,3 +165,6 @@ gtk_scrollbar_style_set  (GtkWidget *widget,
   
   (* GTK_WIDGET_CLASS (parent_class)->style_set) (widget, previous);
 }
+
+#define __GTK_SCROLLBAR_C__
+#include "gtkaliasdef.c"
index 14a7cea142b58bd96351d1f428b9601b81f1582e..2fb94e86f4856266f2e80d47aa7e45b29d955d1f 100644 (file)
 #include <gtk/gtkrange.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_SCROLLBAR            (gtk_scrollbar_get_type ())
 #define GTK_SCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbar))
@@ -68,9 +65,6 @@ struct _GtkScrollbarClass
 GType gtk_scrollbar_get_type (void) G_GNUC_CONST;
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_SCROLLBAR_H__ */
index 6e01ccb6cd3c99c85ffbd39080cae5f90fbdfa90..36e385d0d2ad192476534136c0110134a37bae57 100644 (file)
 #include <config.h>
 #include <math.h>
 #include <gdk/gdkkeysyms.h>
-#include "gtkalias.h"
 #include "gtkbindings.h"
 #include "gtkmarshalers.h"
 #include "gtkscrolledwindow.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 /* scrolled window policy and size requisition handling:
@@ -1418,3 +1418,6 @@ _gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window)
       return scrollbar_spacing;
     }
 }
+
+#define __GTK_SCROLLED_WINDOW_C__
+#include "gtkaliasdef.c"
index 1d147b9976bab77cf3236cc32fcfcd2eddc4d7a7..bff2a77fe4f50ddf6b3797db0e142a7d8ec0f877 100644 (file)
@@ -56,7 +56,6 @@
 #include <string.h>
 #include "gdk.h"
 
-#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkselection.h"
 #include "gdk-pixbuf/gdk-pixbuf.h"
@@ -65,6 +64,8 @@
 #include "x11/gdkx.h"
 #endif
 
+#include "gtkalias.h"
+
 #undef DEBUG_SELECTION
 
 /* Maximum size of a sent chunk, in bytes. Also the default size of
@@ -2532,3 +2533,6 @@ gtk_selection_bytes_per_item (gint format)
     }
   return 0;
 }
+
+#define __GTK_SELECTION_C__
+#include "gtkaliasdef.c"
index 49e906fa6a8989c98e6a304b6f99ffbf6d1b3cef..70985b8435dd164e1c1fd943cc191da6b1251a46 100644 (file)
@@ -32,9 +32,7 @@
 #include <gtk/gtkenums.h>
 #include <gtk/gtkwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GtkTargetList    GtkTargetList;
 typedef struct _GtkTargetEntry   GtkTargetEntry;
@@ -181,10 +179,6 @@ GtkSelectionData *gtk_selection_data_copy     (GtkSelectionData *data);
 void             gtk_selection_data_free     (GtkSelectionData *data);
 
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_SELECTION_H__ */
index 192226800bf34307dacfc372d767d0a9d46792cf..b371301ba567071bc5f8ab39d973d823d237fcd0 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkseparator.h"
+#include "gtkalias.h"
 
 
 static void gtk_separator_class_init (GtkSeparatorClass *klass);
@@ -72,3 +72,6 @@ gtk_separator_init (GtkSeparator *separator)
 {
   GTK_WIDGET_SET_FLAGS (separator, GTK_NO_WINDOW);
 }
+
+#define __GTK_SEPARATOR_C__
+#include "gtkaliasdef.c"
index c0894fc49b59e2056816c51a0dd5fae02ca5ee1d..5ea35644319b062c15581320843b23d957bc4955 100644 (file)
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_SEPARATOR                  (gtk_separator_get_type ())
 #define GTK_SEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR, GtkSeparator))
@@ -63,8 +60,6 @@ struct _GtkSeparatorClass
 GType  gtk_separator_get_type (void) G_GNUC_CONST;
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_SEPARATOR_H__ */
index 09cf39752cd377fbbb9842d6112a674e96d56f30..4077b4479c09b4641238e9e9ec69fa780ebc4052 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkseparatormenuitem.h"
+#include "gtkalias.h"
 
 G_DEFINE_TYPE(GtkSeparatorMenuItem, gtk_separator_menu_item, GTK_TYPE_MENU_ITEM);
 
@@ -46,3 +46,6 @@ gtk_separator_menu_item_new (void)
 {
   return g_object_new (GTK_TYPE_SEPARATOR_MENU_ITEM, NULL);
 }
+
+#define __GTK_SEPARATOR_MENU_ITEM_C__
+#include "gtkaliasdef.c"
index 1d3a0014a0fdbc620c38aae308ee96972523570e..fe4f96bf803739499a2606383d7fb47b12b86f50 100644 (file)
 #include <gtk/gtkmenuitem.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_SEPARATOR_MENU_ITEM            (gtk_separator_menu_item_get_type ())
 #define GTK_SEPARATOR_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR_MENU_ITEM, GtkSeparatorMenuItem))
@@ -62,9 +59,6 @@ GType    gtk_separator_menu_item_get_type        (void) G_GNUC_CONST;
 GtkWidget* gtk_separator_menu_item_new            (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_SEPARATOR_MENU_ITEM_H__ */
index f2c909ac46e8443496bd1314b40cf4f4339127db..afeaf0fe9f2d3b8461fdb251379d6e790758b022 100644 (file)
 #undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkseparatormenuitem.h"
 #include "gtkseparatortoolitem.h"
 #include "gtkintl.h"
 #include "gtktoolbar.h"
+#include "gtkalias.h"
 
 #define MENU_ID "gtk-separator-tool-item-menu-id"
 
@@ -313,3 +313,5 @@ gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *item,
     }
 }
 
+#define __GTK_SEPARATOR_TOOL_ITEM_C__
+#include "gtkaliasdef.c"
index badf30abd1803e3f23f64bed6adc30f45a19e78e..8207cc3cdf51d5104c688ce80e7ff61513751a15 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkmodules.h"
 #include "gtksettings.h"
 #include "gtkrc.h"
 #include "gtkintl.h"
 #include "gtkwidget.h"
+#include "gtkalias.h"
 
 typedef struct _GtkSettingsValuePrivate GtkSettingsValuePrivate;
 
@@ -1404,3 +1404,6 @@ settings_update_modules (GtkSettings *settings)
   
   g_free (modules);
 }
+
+#define __GTK_SETTINGS_C__
+#include "gtkaliasdef.c"
index 31c24f01a8810de8aa843adda14d1575edc3e634..36c1af79ff638c34fc0681a7edc941b2e9fab84f 100644 (file)
@@ -20,8 +20,8 @@
 #undef GTK_DISABLE_DEPRECATED
 
 #include       <config.h>
-#include       "gtkalias.h"
 #include       "gtksignal.h"
+#include       "gtkalias.h"
 
 /* the real parameter limit is of course given by GSignal, bu we need
  * an upper limit for the implementations. so this should be adjusted
@@ -389,3 +389,6 @@ gtk_signal_emitv_by_name (GtkObject   *object,
   
   gtk_signal_emitv (object, g_signal_lookup (name, GTK_OBJECT_TYPE (object)), args);
 }
+
+#define __GTK_SIGNAL_C__
+#include "gtkaliasdef.c"
index 2fb738b2e2491ad9ebdfce7c5cfbd70062b70895..ca6cc5d38c7206dda5f9dbe7877b3cbf7dbf758f 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkcontainer.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksizegroup.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -698,3 +698,6 @@ _gtk_size_group_queue_resize (GtkWidget *widget)
 {
   queue_resize_on_widget (widget, TRUE);
 }
+
+#define __GTK_SIZE_GROUP_C__
+#include "gtkaliasdef.c"
index 8a94ece83cd7fbf48be4a923d5864ded683ad2be..4f0c26c2604565878a93a49dd9b9bd85c44e0889 100644 (file)
@@ -23,9 +23,7 @@
 
 #include <gtk/gtkwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_SIZE_GROUP            (gtk_size_group_get_type ())
 #define GTK_SIZE_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SIZE_GROUP, GtkSizeGroup))
@@ -98,9 +96,6 @@ void _gtk_size_group_compute_requisition   (GtkWidget      *widget,
                                            GtkRequisition *requisition);
 void _gtk_size_group_queue_resize          (GtkWidget      *widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_SIZE_GROUP_H__ */
index 9a62b9a23e517a8dae80085a507d5be9224ffa71..d3fe2756b49c610ea80e50b9c0177f2873397d5f 100644 (file)
@@ -29,7 +29,6 @@
 #include <string.h>
 
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkwindow.h"
@@ -41,6 +40,7 @@
 #include "x11/gdkx.h"
 
 #include "gtkxembed.h"
+#include "gtkalias.h"
 
 typedef struct _GtkSocketPrivate GtkSocketPrivate;
 
@@ -1479,3 +1479,6 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
   
   return return_val;
 }
+
+#define __GTK_SOCKET_C__
+#include "gtkaliasdef.c"
index a3f4d489ada195e0c818d2bc3d84b47864439b12..c522e5ba09174d59778900e95cd75ea61fadc990 100644 (file)
 
 #include <gtk/gtkcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_SOCKET            (gtk_socket_get_type ())
 #define GTK_SOCKET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOCKET, GtkSocket))
@@ -95,9 +92,6 @@ void           gtk_socket_steal    (GtkSocket      *socket_,
                                    GdkNativeWindow wid);
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_SOCKET_H__ */
index ba21fee6eb27d650a20ee994c4b31205c210242c..fe6a435b1b4606449e44cbe183bf41102331d891 100644 (file)
 #include <string.h>
 #include <locale.h>
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 #include "gtkbindings.h"
 #include "gtkspinbutton.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtksettings.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define MIN_SPIN_BUTTON_WIDTH              30
 #define SPIN_BUTTON_INITIAL_TIMER_DELAY    200
@@ -2251,3 +2251,6 @@ spin_button_redraw (GtkSpinButton *spin_button)
       gdk_window_invalidate_rect (spin_button->panel, NULL, TRUE);
     }
 }        
+
+#define __GTK_SPIN_BUTTON_C__
+#include "gtkaliasdef.c"
index 6804f4e4dd76065d03eb09328f1e16ff2f709b36..34b02607fe2cac335fad798da4627cd3b11f7852 100644 (file)
 #include <gtk/gtkadjustment.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_SPIN_BUTTON                  (gtk_spin_button_get_type ())
 #define GTK_SPIN_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPIN_BUTTON, GtkSpinButton))
@@ -190,9 +187,6 @@ void            gtk_spin_button_update             (GtkSpinButton  *spin_button)
 #define gtk_spin_button_get_value_as_float gtk_spin_button_get_value
 #endif
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #endif /* __GTK_SPIN_BUTTON_H__ */
index fed30e6878cbf3f6ad79bc6b5c324364d8d2fada..407b658f21573d8446a9695d0e8bee470cff785a 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkframe.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkstatusbar.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 typedef struct _GtkStatusbarMsg GtkStatusbarMsg;
 
@@ -871,3 +871,6 @@ label_selectable_changed (GtkWidget  *label,
       statusbar->has_resize_grip && statusbar->grip_window)
     gdk_window_raise (statusbar->grip_window);
 }
+
+#define __GTK_STATUSBAR_C__
+#include "gtkaliasdef.c"
index 84026ca44915ae7b4f6676a2fef8ad6dd9a91ce9..91f4d15aa3bfe015ee4e1f359edbc4e25447308c 100644 (file)
 
 #include <gtk/gtkhbox.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_STATUSBAR            (gtk_statusbar_get_type ())
 #define GTK_STATUSBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR, GtkStatusbar))
@@ -106,7 +103,6 @@ void     gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar,
                                            gboolean      setting);
 gboolean gtk_statusbar_get_has_resize_grip (GtkStatusbar *statusbar);
 
-#ifdef __cplusplus
-} 
-#endif /* __cplusplus */
+G_END_DECLS
+
 #endif /* __GTK_STATUSBAR_H__ */
index 93b3934483765eaa3674d2b849c786f886f2a3c3..5a4482ea61a7b59a226e7a2dc9632e38dd69c99d 100644 (file)
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtkstock.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include <gdk/gdkkeysyms.h>
+#include "gtkalias.h"
 
 static GHashTable *translate_hash = NULL;
 static GHashTable *stock_hash = NULL;
@@ -489,3 +489,6 @@ init_stock_hash (void)
                                    NULL);
     }
 }
+
+#define __GTK_STOCK_C__
+#include "gtkaliasdef.c"
index d079a1aa218c77f9e77863563bd79329bf603862..0aa52116213e655ea3daf1f33085df6df17986b5 100644 (file)
@@ -31,9 +31,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkitemfactory.h> /* for GtkTranslateFunc */
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GtkStockItem GtkStockItem;
 
@@ -161,9 +159,6 @@ void          gtk_stock_set_translate_func (const gchar      *domain,
 #define GTK_STOCK_ZOOM_IN          "gtk-zoom-in"
 #define GTK_STOCK_ZOOM_OUT         "gtk-zoom-out"
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_STOCK_H__ */
index 8f9adc4d3aa61834ab3dbf58973ad96ff168c2d4..d014c798fbd63f7a0d6961d3e06964992d838b0d 100644 (file)
@@ -28,7 +28,6 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtkgc.h"
 #include "gtkmarshalers.h"
 #include "gtkrc.h"
@@ -38,6 +37,7 @@
 #include "gtkthemes.h"
 #include "gtkiconfactory.h"
 #include "gtksettings.h"       /* _gtk_settings_parse_convert() */
+#include "gtkalias.h"
 
 #define LIGHTNESS_MULT  1.3
 #define DARKNESS_MULT   0.7
@@ -6766,3 +6766,6 @@ gtk_draw_insertion_cursor (GtkWidget        *widget,
   if (area)
     gdk_gc_set_clip_rectangle (gc, NULL);
 }
+
+#define __GTK_STYLE_C__
+#include "gtkaliasdef.c"
index 967c7ccc1dd43cc4ee0de2b502736bd275efa983..4ae3143459c212f50ca2167963a09dda0533cc21 100644 (file)
@@ -32,9 +32,7 @@
 #include <gtk/gtkenums.h>
 #include <pango/pango.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_STYLE              (gtk_style_get_type ())
 #define GTK_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_STYLE, GtkStyle))
@@ -893,9 +891,6 @@ void   gtk_draw_insertion_cursor (GtkWidget        *widget,
                                  GtkTextDirection  direction,
                                  gboolean          draw_arrow);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_STYLE_H__ */
index 142882726bbb7e6b23c2a321be04898afab287b0..308a88ee93a15fd71a4082b1b05252a838c979d3 100644 (file)
@@ -25,9 +25,9 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktable.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum
 {
@@ -1666,3 +1666,6 @@ gtk_table_size_allocate_pass2 (GtkTable *table)
        }
     }
 }
+
+#define __GTK_TABLE_C__
+#include "gtkaliasdef.c"
index 24fc2527e2be45092b345280dcd096c749496c28..f925d330dacfe4f8c8cd76c61066025e9a5e77b2 100644 (file)
 #include <gtk/gtkcontainer.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TABLE                 (gtk_table_get_type ())
 #define GTK_TABLE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TABLE, GtkTable))
@@ -143,9 +140,6 @@ void           gtk_table_set_homogeneous  (GtkTable        *table,
 gboolean   gtk_table_get_homogeneous  (GtkTable        *table);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TABLE_H__ */
index 9df9ea9d908b22ce9949584786e43a0e07a20270..88a6a466f77f54fe811029083fb8de7c1319b230 100644 (file)
@@ -26,9 +26,9 @@
 
 #include <config.h>
 
-#include "gtkalias.h"
 #include "gtkmenu.h"
 #include "gtktearoffmenuitem.h"
+#include "gtkalias.h"
 
 #define ARROW_SIZE 10
 #define TEAR_LENGTH 5
@@ -285,3 +285,6 @@ gtk_tearoff_menu_item_parent_set (GtkWidget *widget,
                        tearoff_menu_item);
     }  
 }
+
+#define __GTK_TEAROFF_MENU_ITEM_C__
+#include "gtkaliasdef.c"
index ba5ff76a8a4f11f212829508b10ca0341fdbdb83..cd744b0d432e57c8a1e2219ef586792f9b50cd28 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GTK_MENU_TEAROFF_ITEM_H__
-#define __GTK_MENU_TEAROFF_ITEM_H__
+#ifndef __GTK_TEAROFF_MENU_ITEM_H__
+#define __GTK_TEAROFF_MENU_ITEM_H__
 
 
 #include <gdk/gdk.h>
 #include <gtk/gtkmenuitem.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TEAROFF_MENU_ITEM           (gtk_tearoff_menu_item_get_type ())
 #define GTK_TEAROFF_MENU_ITEM(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItem))
@@ -70,9 +66,6 @@ struct _GtkTearoffMenuItemClass
 GType     gtk_tearoff_menu_item_get_type     (void) G_GNUC_CONST;
 GtkWidget* gtk_tearoff_menu_item_new         (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TEAROFF_MENU_ITEM_H__ */
index f78e8ba31699a3c7adc873a09bf6b2d519bd1fc8..99ece3aeecc6e61ef5167a66f3b6aa2e4308bdb4 100644 (file)
 #include <string.h>
 #include "gdk/gdkkeysyms.h"
 #include "gdk/gdki18n.h"
-#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkselection.h"
 #include "gtksignal.h"
+#include "gtkstyle.h"
+#include "gtkobject.h"
 #define GTK_ENABLE_BROKEN
 #include "gtktext.h"
 #include "line-wrap.xbm"
 #include "line-arrow.xbm"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 #define INITIAL_BUFFER_SIZE      1024
@@ -5540,3 +5542,6 @@ gtk_text_show_props (GtkText *text,
     g_warning ("incorrect property list length in %s:%d -- bad!", msg, line);
 }
 #endif
+
+#define __GTK_TEXT_C__
+#include "gtkaliasdef.c"
index c3ba9e1293e53d5969f0873f281930bb497ab30c..a2be7faf59a29318c60c8f6d40d671fddb74b766 100644 (file)
 #include <gtk/gtkadjustment.h>
 #include <gtk/gtkoldeditable.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TEXT                  (gtk_text_get_type ())
 #define GTK_TEXT(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT, GtkText))
@@ -214,10 +211,7 @@ gboolean   gtk_text_forward_delete  (GtkText       *text,
        : ((index) < (t)->gap_position ? (t)->text.ch[index] : \
                                        (t)->text.ch[(index)+(t)->gap_size]))
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TEXT_H__ */
 
index 8d26eeaed3df84927cbdb9ba29e79a122a6b0e39..ac5a9fc9043f4f4b7e0cd6ec3824b36b6ce73c40 100644 (file)
@@ -54,7 +54,6 @@
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktextbtree.h"
 #include <string.h>
 #include <stdlib.h>
@@ -65,6 +64,7 @@
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
 #include "gtktextmarkprivate.h"
+#include "gtkalias.h"
 
 /*
  * Types
@@ -7243,4 +7243,5 @@ _gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment * seg)
     }
 }
 
-
+#define __GTK_TEXT_BTREE_C__
+#include "gtkaliasdef.c"
index 59ef11408ace536a11dbd12e8addc5b28f5babb4..9881dfd43f046c6752593935f93f41d66c68bda2 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef GTK_TEXT_BTREE_H
-#define GTK_TEXT_BTREE_H
+#ifndef __GTK_TEXT_BTREE_H__
+#define __GTK_TEXT_BTREE_H__
 
 #if 0
 #define DEBUG_VALIDATION_AND_SCROLLING
@@ -18,9 +18,7 @@
 #include <gtk/gtktextsegment.h>
 #include <gtk/gtktextiter.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 GtkTextBTree  *_gtk_text_btree_new        (GtkTextTagTable *table,
                                            GtkTextBuffer   *buffer);
@@ -315,9 +313,7 @@ void _gtk_text_btree_release_mark_segment (GtkTextBTree       *tree,
 void _gtk_text_btree_notify_will_remove_tag (GtkTextBTree *tree,
                                              GtkTextTag   *tag);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
index 930312adf95cf4a397e7b03bfd129e039f6dc3a1..17dafaad798a3431bbc5acd1172efb1646a87ad4 100644 (file)
@@ -30,7 +30,6 @@
 #include <stdarg.h>
 
 
-#include "gtkalias.h"
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include "gtkclipboard.h"
 #include "gtkinvisible.h"
@@ -39,6 +38,7 @@
 #include "gtktextbtree.h"
 #include "gtktextiterprivate.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 typedef struct _ClipboardRequest ClipboardRequest;
 
@@ -3770,3 +3770,6 @@ _gtk_text_buffer_spew (GtkTextBuffer *buffer)
 {
   _gtk_text_btree_spew (get_btree (buffer));
 }
+
+#define __GTK_TEXT_BUFFER_C__
+#include "gtkaliasdef.c"
index a944b8594404d52ab144965040360f350fbf6072..419ad4d3c38ac3ac79f87123e0f120a76a97b70a 100644 (file)
@@ -24,8 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_TEXT_BUFFER_H
-#define GTK_TEXT_BUFFER_H
+#ifndef __GTK_TEXT_BUFFER_H__
+#define __GTK_TEXT_BUFFER_H__
 
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkclipboard.h>
@@ -34,9 +34,7 @@
 #include <gtk/gtktextmark.h>
 #include <gtk/gtktextchild.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * This is the PUBLIC representation of a text buffer.
@@ -377,8 +375,6 @@ const PangoLogAttr* _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buff
 void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
                                               GtkTextTag    *tag);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
index 76c0449240588dd7a62ed94a6b1ae26c4d3e6d48..68f5dd5fbdde4c04e76b61a0dbda599e3c33aff5 100644 (file)
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktextchild.h"
 #include "gtktextbtree.h"
 #include "gtktextlayout.h"
+#include "gtkalias.h"
 
 #define CHECK_IN_BUFFER(anchor)                                                            \
   G_STMT_START {                                                                           \
@@ -539,4 +539,5 @@ gtk_text_anchored_child_set_layout (GtkWidget     *child,
   _gtk_anchored_child_set_layout (child, layout);
 }
 
-
+#define __GTK_TEXT_CHILD_C__
+#include "gtkaliasdef.c"
index de84f7be353a6a1e41a656632083c3c2eda77939..19c3ad9a3f9f42d917b61b08d831d7d5b20979da 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_TEXT_CHILD_H
-#define GTK_TEXT_CHILD_H
+#ifndef __GTK_TEXT_CHILD_H__
+#define __GTK_TEXT_CHILD_H__
 
 #include <glib-object.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* A GtkTextChildAnchor is a spot in the buffer where child widgets
  * can be "anchored" (inserted inline, as if they were characters).
@@ -74,8 +72,6 @@ GtkTextChildAnchor* gtk_text_child_anchor_new (void);
 GList*   gtk_text_child_anchor_get_widgets (GtkTextChildAnchor *anchor);
 gboolean gtk_text_child_anchor_get_deleted (GtkTextChildAnchor *anchor);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
index 70ce11344e3023a09c535e1a76394f32c4e3b9dc..7ef2e0beec859715ed8bcd41ab984cd47a15c2e3 100644 (file)
  *
  */
 
-#ifndef GTK_TEXT_CHILD_PRIVATE_H
-#define GTK_TEXT_CHILD_PRIVATE_H
+#ifndef __GTK_TEXT_CHILD_PRIVATE_H__
+#define __GTK_TEXT_CHILD_PRIVATE_H__
 
 #include <gtk/gtktexttypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GtkTextPixbuf GtkTextPixbuf;
 
@@ -85,8 +83,6 @@ void                _gtk_widget_segment_unref    (GtkTextLineSegment *widget_seg
 
 GtkTextLayout*      _gtk_anchored_child_get_layout (GtkWidget *child);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
index 1e0058dc8552f05c875c19eb1c964bfa87427317..94f7a1a8ccd1d608454fb0f04d67b82b13ed9e6d 100644 (file)
@@ -76,8 +76,8 @@
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktextdisplay.h"
+#include "gtkalias.h"
 /* DO NOT go putting private headers in here. This file should only
  * use the semi-public headers, as with gtktextview.c.
  */
@@ -832,3 +832,6 @@ gtk_text_layout_draw (GtkTextLayout *layout,
 
   g_slist_free (line_list);
 }
+
+#define __GTK_TEXT_DISPLAY_C__
+#include "gtkaliasdef.c"
index 28735d57631d1d51ea5daccbd61c003384afbc7c..b93a84c2b2dde54d99976f00a883399bed2c03d1 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_TEXT_DISPLAY_H
-#define GTK_TEXT_DISPLAY_H
+#ifndef __GTK_TEXT_DISPLAY_H__
+#define __GTK_TEXT_DISPLAY_H__
 
 #include <gtk/gtktextlayout.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* A semi-public header intended for use by code that also
  * uses GtkTextLayout
@@ -109,9 +107,6 @@ void gtk_text_layout_draw (GtkTextLayout        *layout,
                            GList               **widgets);
 
 
+G_END_DECLS
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif  /* GTK_TEXT_DISPLAY_H */
+#endif  /* __GTK_TEXT_DISPLAY_H__ */
index b61f67b6374f3c1de500396ef393f121795dd973..d0198b31ae746fee5b5fcc9a200ea7574b6c29ff 100644 (file)
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktextiter.h"
 #include "gtktextbtree.h"
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
+#include "gtkalias.h"
 #include <string.h>
 
 #define FIX_OVERFLOWS(varname) if ((varname) == G_MININT) (varname) = G_MININT + 1
@@ -5446,3 +5446,5 @@ _gtk_text_iter_check (const GtkTextIter *iter)
     g_error ("Iterator was on last line (past the end iterator)");
 }
 
+#define __GTK_TEXT_ITER_C__
+#include "gtkaliasdef.c"
index ba1f883bc445f3683bb67c4621338597049e61ba..6816cc222addc1d3efe7e816e1f11b7a8849a41f 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_TEXT_ITER_H
-#define GTK_TEXT_ITER_H
+#ifndef __GTK_TEXT_ITER_H__
+#define __GTK_TEXT_ITER_H__
 
 #include <gtk/gtktexttag.h>
 #include <gtk/gtktextchild.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
   GTK_TEXT_SEARCH_VISIBLE_ONLY = 1 << 0,
@@ -291,9 +289,7 @@ gboolean gtk_text_iter_in_range        (const GtkTextIter *iter,
 void     gtk_text_iter_order           (GtkTextIter *first,
                                         GtkTextIter *second);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
index b0c38662d5cabd8fbf924270bc142a7fd1951cfe..b5b8506bf08961a627183959f783402ca8beb083 100644 (file)
@@ -1,11 +1,9 @@
-#ifndef GTK_TEXT_ITER_PRIVATE_H
-#define GTK_TEXT_ITER_PRIVATE_H
+#ifndef __GTK_TEXT_ITER_PRIVATE_H__
+#define __GTK_TEXT_ITER_PRIVATE_H__
 
 #include <gtk/gtktextiter.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include <gtk/gtktextiter.h>
 #include <gtk/gtktextbtree.h>
@@ -23,9 +21,7 @@ gint                _gtk_text_iter_get_segment_char           (const GtkTextIter
 /* debug */
 void _gtk_text_iter_check (const GtkTextIter *iter);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
index 3738a93e57a7594d07359ce379ac95762f732935..4d619ca49cbea1d30d164523874ad3dbad0d2009 100644 (file)
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkmarshalers.h"
 #include "gtktextlayout.h"
 #include "gtktextbtree.h"
 #include "gtktextiterprivate.h"
+#include "gtkalias.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -3272,3 +3272,6 @@ gtk_text_layout_buffer_delete_range (GtkTextBuffer *textbuffer,
 
   gtk_text_layout_update_cursor_line (layout);
 }
+
+#define __GTK_TEXT_LAYOUT_C__
+#include "gtkaliasdef.c"
index 0e02b1294a7f03cc46e68f04707a2304c742d78e..36a6efb51f66162fdc42fe4ecfaf5d55fcb1af19 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_TEXT_LAYOUT_H
-#define GTK_TEXT_LAYOUT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#ifndef __GTK_TEXT_LAYOUT_H__
+#define __GTK_TEXT_LAYOUT_H__
 
 /* This is a "semi-private" header; it is intended for
  * use by the text widget, and the text canvas item,
@@ -96,6 +92,8 @@ extern "C" {
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextiter.h>
 
+G_BEGIN_DECLS
+
 /* forward declarations that have to be here to avoid including
  * gtktextbtree.h
  */
@@ -414,8 +412,6 @@ void gtk_text_anchored_child_set_layout     (GtkWidget          *child,
 
 void gtk_text_layout_spew (GtkTextLayout *layout);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif  /* GTK_TEXT_LAYOUT_H */
+#endif  /* __GTK_TEXT_LAYOUT_H__ */
index b0ac68e930b35284320d15a5d3dea513053a932e..52af695bc3f2692915ad5ba30e89548ca72439bd 100644 (file)
@@ -49,8 +49,8 @@
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktextbtree.h"
+#include "gtkalias.h"
 
 static void gtk_text_mark_init       (GtkTextMark      *mark);
 static void gtk_text_mark_class_init (GtkTextMarkClass *klass);
@@ -393,3 +393,6 @@ mark_segment_check_func (GtkTextLineSegment *seg,
   if (seg->body.mark.line != line)
     g_error ("mark_segment_check_func: seg->body.mark.line bogus");
 }
+
+#define __GTK_TEXT_MARK_C__
+#include "gtkaliasdef.c"
index 30eb59af2a76c7fb85f3ad6831acc084a2203961..851123c4ac0bcae4fc50c0d98baf839278ae7e4d 100644 (file)
  *
  */
 
-#ifndef GTK_TEXT_MARK_H
-#define GTK_TEXT_MARK_H
+#ifndef __GTK_TEXT_MARK_H__
+#define __GTK_TEXT_MARK_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* The GtkTextMark data type */
 
@@ -95,9 +93,7 @@ gboolean              gtk_text_mark_get_deleted      (GtkTextMark *mark);
 GtkTextBuffer*        gtk_text_mark_get_buffer       (GtkTextMark *mark);
 gboolean              gtk_text_mark_get_left_gravity (GtkTextMark *mark);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
index 425b516919c785df5ce74beca6e046243ca4eefb..c9043f431e46f65dfc741056b455ffb161bfad19 100644 (file)
@@ -1,13 +1,11 @@
-#ifndef GTK_TEXT_MARK_PRIVATE_H
-#define GTK_TEXT_MARK_PRIVATE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#ifndef __GTK_TEXT_MARK_PRIVATE_H__
+#define __GTK_TEXT_MARK_PRIVATE_H__
 
 #include <gtk/gtktexttypes.h>
 #include <gtk/gtktextlayout.h>
 
+G_BEGIN_DECLS
+
 #define GTK_IS_TEXT_MARK_SEGMENT(mark) (((GtkTextLineSegment*)mark)->type == &gtk_text_left_mark_type || \
                                 ((GtkTextLineSegment*)mark)->type == &gtk_text_right_mark_type)
 
@@ -29,9 +27,7 @@ GtkTextLineSegment *_gtk_mark_segment_new   (GtkTextBTree       *tree,
                                              gboolean            left_gravity,
                                              const gchar        *name);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
index aa5949c6a5211f9f19752aeea96dcd5f5ae46c10..390e14bcfc08981cc064cba8130ba11afab9bc33 100644 (file)
@@ -52,7 +52,6 @@
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktextbtree.h"
 #include <string.h>
 #include <stdlib.h>
@@ -62,6 +61,7 @@
 #include "gtktextlayout.h"
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
+#include "gtkalias.h"
 
 /*
  *--------------------------------------------------------------
@@ -623,3 +623,6 @@ GtkTextLineSegmentClass gtk_text_toggle_off_type = {
   toggle_segment_line_change_func,                      /* lineChangeFunc */
   _gtk_toggle_segment_check_func                        /* checkFunc */
 };
+
+#define __GTK_TEXT_SEGMENT_C__
+#include "gtkaliasdef.c"
index b28ec9f42d7feda3540bd5743307cba6355ed84d..79bda9a23366ab3d76c47724b7ce9b27d0f0c16a 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef GTK_TEXT_SEGMENT_H
-#define GTK_TEXT_SEGMENT_H
+#ifndef __GTK_TEXT_SEGMENT_H__
+#define __GTK_TEXT_SEGMENT_H__
 
 #include <gtk/gtktexttag.h>
 #include <gtk/gtktextiter.h>
@@ -7,9 +7,7 @@
 #include <gtk/gtktextchild.h>
 #include <gtk/gtktextchildprivate.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * Segments: each line is divided into one or more segments, where each
@@ -140,9 +138,7 @@ GtkTextLineSegment *_gtk_toggle_segment_new                (GtkTextTagInfo *info
                                                             gboolean        on);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
index 3774884253e4338c9c029bbaa52b5e99fd84bd1a..890c74447dad65dddc857095fb5d737339a21575 100644 (file)
@@ -48,7 +48,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtktexttag.h"
 #include "gtktexttypes.h"
@@ -56,6 +55,7 @@
 #include "gtkmain.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -2165,3 +2165,6 @@ _gtk_text_tag_affects_nonsize_appearance (GtkTextTag *tag)
     tag->strikethrough_set ||
     tag->bg_full_height_set;
 }
+
+#define __GTK_TEXT_TAG_C__
+#include "gtkaliasdef.c"
index 37d10f440388bd89994175fb3a5750a95d0879fb..2074e23d8726bef7fbd820c4751480b1b4cd748c 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef GTK_TEXT_TAG_H
-#define GTK_TEXT_TAG_H
+#ifndef __GTK_TEXT_TAG_H__
+#define __GTK_TEXT_TAG_H__
 
 #include <glib-object.h>
 #include <gdk/gdk.h>
@@ -8,9 +8,7 @@
 /* Not needed, retained for compatibility -Yosh */
 #include <gtk/gtkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GtkTextIter GtkTextIter;
 typedef struct _GtkTextTagTable GtkTextTagTable;
@@ -231,9 +229,7 @@ void               gtk_text_attributes_ref         (GtkTextAttributes *values);
 GType              gtk_text_attributes_get_type    (void) G_GNUC_CONST;
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
index 20c0ae5c54be1d9f145b4978fd6c6c19a07b364c..44fe225016c603d17afdde2c7add7be6f9b55277 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef GTK_TEXT_TAG_PRIVATE_H
-#define GTK_TEXT_TAG_PRIVATE_H
+#ifndef __GTK_TEXT_TAG_PRIVATE_H__
+#define __GTK_TEXT_TAG_PRIVATE_H__
 
 #include <gtk/gtktexttag.h>
 
index f7ffc2ed7db463ab8bb1c3313e7031d80493b4a1..71ad4948e6c3b73b9fb442bfde70f82882b41588 100644 (file)
@@ -1,9 +1,9 @@
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktexttagtable.h"
 #include "gtkmarshalers.h"
 #include "gtktextbuffer.h" /* just for the lame notify_will_remove_tag hack */
+#include "gtkalias.h"
 
 #include <stdlib.h>
 
@@ -425,3 +425,6 @@ _gtk_text_tag_table_remove_buffer (GtkTextTagTable *table,
   
   table->buffers = g_slist_remove (table->buffers, buffer);
 }
+
+#define __GTK_TEXT_TAG_TABLE_C__
+#include "gtkaliasdef.c"
index deec3820a41583dc6f1af8e13a4866163a2130bb..05b9d02a2f523bc8d04f4f916173260a68c54e9b 100644 (file)
@@ -1,11 +1,9 @@
-#ifndef GTK_TEXT_TAG_TABLE_H
-#define GTK_TEXT_TAG_TABLE_H
+#ifndef __GTK_TEXT_TAG_TABLE_H__
+#define __GTK_TEXT_TAG_TABLE_H__
 
 #include <gtk/gtktexttag.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include <gtk/gtktexttag.h>
 
@@ -69,9 +67,7 @@ void _gtk_text_tag_table_add_buffer    (GtkTextTagTable *table,
 void _gtk_text_tag_table_remove_buffer (GtkTextTagTable *table,
                                         gpointer         buffer);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
index 1a126491b63b8697450f47899078fb583ea4ab75..86a79c290775b40dc28dbe3cf328dcb3ada27abf 100644 (file)
@@ -1,6 +1,6 @@
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktexttypes.h"
+#include "gtkalias.h"
 
 /* These are used to represent embedded non-character objects
  * if you return a string representation of a text buffer
@@ -18,3 +18,6 @@ gtk_text_byte_begins_utf8_char (const gchar *byte)
 {
   return inline_byte_begins_utf8_char (byte);
 }
+
+#define __GTK_TEXT_TYPES_C__
+#include "gtkaliasdef.c"
index 1dad2261801d2cd12b3b74030dba71178204f7fa..78434d7bb5267e356e038190b281ed80b47f12e1 100644 (file)
@@ -1,15 +1,12 @@
-#ifndef GTK_TEXT_TYPES_H
-#define GTK_TEXT_TYPES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#ifndef __GTK_TEXT_TYPES_H__
+#define __GTK_TEXT_TYPES_H__
 
 #include <glib.h>
 
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktexttagprivate.h>
 
+G_BEGIN_DECLS
 
 typedef struct _GtkTextCounter GtkTextCounter;
 typedef struct _GtkTextLineSegment GtkTextLineSegment;
@@ -53,9 +50,7 @@ VARIABLE const gchar gtk_text_unknown_char_utf8[];
 
 gboolean gtk_text_byte_begins_utf8_char (const gchar *byte);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
index 4eea20880bcc6891b1a0dfcda7a3b10fc667c9b7..9d72c18646dd8e17900f634d183452e01f8ad4c7 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktextutil.h"
 #include "gtkintl.h"
 #include "gtkmenuitem.h"
+#include "gtkalias.h"
 
 typedef struct _GtkUnicodeMenuEntry GtkUnicodeMenuEntry;
 typedef struct _GtkTextUtilCallbackInfo GtkTextUtilCallbackInfo;
index 64bb6aee1b5df2265b9958be05b27d2e955db502..5f8bf2ed64c8b0537826eddfb7fcd6cb92bb1565 100644 (file)
@@ -27,7 +27,6 @@
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include "gtkbindings.h"
 #include "gtkdnd.h"
@@ -48,6 +47,7 @@
 #include "gtksizegroup.h"          /* FIXME http://bugzilla.gnome.org/show_bug.cgi?id=72258 */
 #include "gtktextutil.h"
 #include "gtkwindow.h"
+#include "gtkalias.h"
 
 /* How scrolling, validation, exposes, etc. work.
  *
@@ -8301,3 +8301,6 @@ gtk_text_view_move_visually (GtkTextView *text_view,
 
   return gtk_text_layout_move_iter_visually (text_view->layout, iter, count);
 }
+
+#define __GTK_TEXT_VIEW_C__
+#include "gtkaliasdef.c"
index 3ad5cd6feb2705adeb5ad11cd67b6f3e8e9d13ac..ff3a67c800f73372359efd371bd67fe27ffe6c86 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_TEXT_VIEW_H
-#define GTK_TEXT_VIEW_H
+#ifndef __GTK_TEXT_VIEW_H__
+#define __GTK_TEXT_VIEW_H__
 
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtkmenu.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TEXT_VIEW             (gtk_text_view_get_type ())
 #define GTK_TEXT_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_VIEW, GtkTextView))
@@ -363,8 +361,6 @@ PangoTabArray*   gtk_text_view_get_tabs               (GtkTextView      *text_vi
 /* note that the return value of this changes with the theme */
 GtkTextAttributes* gtk_text_view_get_default_attributes (GtkTextView    *text_view);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* GTK_TEXT_VIEW_H */
+#endif /* __GTK_TEXT_VIEW_H__ */
index c166c09333ba8a758955173c951132267073f6df..78fbac6d134d66816684904a36b52ebd6f65c09f 100644 (file)
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmodule.h>
-#include "gtkalias.h"
 #include "gtkthemes.h"
 #include "gtkrc.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 typedef struct _GtkThemeEngineClass GtkThemeEngineClass;
 
@@ -191,3 +191,6 @@ gtk_theme_engine_create_rc_style (GtkThemeEngine *engine)
 
   return engine->create_rc_style ();
 }
+
+#define __GTK_THEMES_C__
+#include "gtkaliasdef.c"
index 8185a7f82d14e1c2209c0a8c9ee5798929099ea7..0991f7d07cb21f290829414771fb2bea5db2bd99 100644 (file)
@@ -32,9 +32,7 @@
 #include <gtk/gtkstyle.h>
 #include <gtk/gtkwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_THEME_ENGINE             (gtk_theme_engine_get_type ())
 #define GTK_THEME_ENGINE(theme_engine)    (G_TYPE_CHECK_INSTANCE_CAST ((theme_engine), GTK_TYPE_THEME_ENGINE, GtkThemeEngine))
@@ -44,9 +42,6 @@ GType           gtk_theme_engine_get_type        (void) G_GNUC_CONST;
 GtkThemeEngine *gtk_theme_engine_get             (const gchar     *name);
 GtkRcStyle     *gtk_theme_engine_create_rc_style (GtkThemeEngine  *engine);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_THEMES_H__ */
index ce7931a79bd99aa22eff8ec9679c432281c3edff..aee4ffada284230f4b9686e6abb43ba4d585ab38 100644 (file)
 #undef GTK_DISABLE_DEPRECATED
 
 #include       <config.h>
-#include       "gtkalias.h"
 #include       "gtktipsquery.h"
 #include       "gtksignal.h"
 #include       "gtktooltips.h"
 #include       "gtkmain.h"
 #include        "gtkmarshalers.h"
 #include       "gtkintl.h"
+#include       "gtkalias.h"
 
 
 
@@ -518,3 +518,6 @@ gtk_tips_query_event (GtkWidget            *widget,
 
   return event_handled;
 }
+
+#define __GTK_TIPS_QUERY_C__
+#include "gtkaliasdef.c"
index d7959788e90cf320c37c6ab702b5fc3286941f75..2a09baed14bc24044f77bb80398ee9622687904b 100644 (file)
 
 #ifndef GTK_DISABLE_DEPRECATED
 
-#ifndef __GTKTIPSQUERY_H__
-#define __GTKTIPSQUERY_H__
+#ifndef __GTK_TIPS_QUERY_H__
+#define __GTK_TIPS_QUERY_H__
 
 
 #include <gtk/gtklabel.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 /* --- type macros --- */
 #define        GTK_TYPE_TIPS_QUERY             (gtk_tips_query_get_type ())
@@ -106,13 +103,8 @@ void               gtk_tips_query_set_labels       (GtkTipsQuery   *tips_query,
                                                 const gchar    *label_inactive,
                                                 const gchar    *label_no_tip);
      
+G_END_DECLS
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GTKTIPSQUERY_H__ */
+#endif /* __GTK_TIPS_QUERY_H__ */
 
 #endif /* GTK_DISABLE_DEPRECATED */
index 92a97934152d6725d3bae91fbf4f44655cacac88..ab2cd3871ba59c3f83cbe16c414ac547c2ca4fe2 100644 (file)
 
 #include <config.h>
 
-#include "gtkalias.h"
 #include "gtkintl.h"
 #include "gtktoggleaction.h"
 #include "gtktoggleactionprivate.h"
 #include "gtktoggletoolbutton.h"
 #include "gtktogglebutton.h"
 #include "gtkcheckmenuitem.h"
+#include "gtkalias.h"
 
 enum 
 {
@@ -410,3 +410,6 @@ create_menu_item (GtkAction *action)
                       "draw_as_radio", toggle_action->private_data->draw_as_radio,
                       NULL);
 }
+
+#define __GTK_TOGGLE_ACTION_C__
+#include "gtkaliasdef.c"
index fd846403bb130e90153d8ab98bcbab0b293040ec..be6b3c72a298b41fb615014a044185de582179f3 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtktogglebutton.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define DEFAULT_LEFT_POS  4
 #define DEFAULT_TOP_POS   4
@@ -497,3 +497,6 @@ gtk_toggle_button_update_state (GtkButton *button)
   _gtk_button_set_depressed (button, depressed); 
   gtk_widget_set_state (GTK_WIDGET (toggle_button), new_state);
 }
+
+#define __GTK_TOGGLE_BUTTON_C__
+#include "gtkaliasdef.c"
index 5ab74ec5f7e83ac4916d1dee55682d9370705f3d..c5bb68e3e9e22ee919903c42ee28c415c8e9e4de 100644 (file)
 #include <gdk/gdk.h>
 #include <gtk/gtkbutton.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TOGGLE_BUTTON                  (gtk_toggle_button_get_type ())
 #define GTK_TOGGLE_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_BUTTON, GtkToggleButton))
@@ -92,9 +88,6 @@ gboolean   gtk_toggle_button_get_inconsistent  (GtkToggleButton *toggle_button);
 #define        gtk_toggle_button_set_state             gtk_toggle_button_set_active
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TOGGLE_BUTTON_H__ */
index e4b57c62beab4a000b3b0982d484d4d8d431aaf4..63312de88e7ab0bbdaae35c90a893625f4d1c74e 100644 (file)
@@ -20,7 +20,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktoggletoolbutton.h"
 #include "gtkcheckmenuitem.h"
 #include "gtklabel.h"
@@ -28,6 +27,7 @@
 #include "gtkstock.h"
 #include "gtkintl.h"
 #include "gtkradiotoolbutton.h"
+#include "gtkalias.h"
 
 #define MENU_ID "gtk-toggle-tool-button-menu-id"
 
@@ -334,3 +334,6 @@ gtk_toggle_tool_button_get_active (GtkToggleToolButton *button)
 
   return button->priv->active;
 }
+
+#define __GTK_TOGGLE_TOOL_BUTTON_C__
+#include "gtkaliasdef.c"
index 0eab9f689d343dfa70c41029934c356c658a2903..dd1de9de0601097fbff3768a7e13bc15d45d9b4e 100644 (file)
@@ -32,7 +32,6 @@
 #undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkarrow.h"
 #include "gtktoolbar.h"
 #include "gtkradiotoolbutton.h"
@@ -53,6 +52,7 @@
 #include "gtkvbox.h"
 #include "gtkimage.h"
 #include "gtkseparatormenuitem.h"
+#include "gtkalias.h"
 #include <math.h>
 
 typedef struct _ToolbarContent ToolbarContent;
@@ -4775,3 +4775,6 @@ _gtk_toolbar_rebuild_menu (GtkToolbar *toolbar)
   
   gtk_widget_queue_resize (GTK_WIDGET (toolbar));
 }
+
+#define __GTK_TOOLBAR_C__
+#include "gtkaliasdef.c"
index 818da4bc6801ae7c097d96c19dcc5dba76691583..fd0e697542e87d4554b949987619239d305973cb 100644 (file)
@@ -21,7 +21,6 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktoolbutton.h"
 #include "gtkbutton.h"
 #include "gtkhbox.h"
@@ -34,6 +33,7 @@
 #include "gtkintl.h"
 #include "gtktoolbar.h"
 #include "gtkiconfactory.h"
+#include "gtkalias.h"
 
 #include <string.h>
 
@@ -949,3 +949,5 @@ _gtk_tool_button_get_button (GtkToolButton *button)
   return button->priv->button;
 }
 
+#define __GTK_TOOL_BUTTON_C__
+#include "gtkaliasdef.c"
index dd610dc673944c85a2e6ce9fa9973a771fc45ad8..4869f8c8768fed8031a4833290b66b69ea96c8c6 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktoolitem.h"
 #include "gtkmarshalers.h"
 #include "gtktoolbar.h"
 #include "gtkseparatormenuitem.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
+#include "gtkalias.h"
 
 #include <string.h>
 
@@ -1139,3 +1139,5 @@ _gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item)
   gtk_widget_queue_resize (GTK_WIDGET (tool_item));
 }
 
+#define __GTK_TOOL_ITEM_C__
+#include "gtkaliasdef.c"
index bb5b345de1394676062774ce7c3a0a53360e92cf..b63f2557553237a72583fa775fded907b5e67f0c 100644 (file)
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "gtkalias.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmenuitem.h"
@@ -38,6 +37,7 @@
 #include "gtkwindow.h"
 #include "gtkstyle.h"
 #include "gtktooltips.h"
+#include "gtkalias.h"
 
 
 #define DEFAULT_DELAY 500           /* Default delay in ms */
@@ -795,3 +795,6 @@ gtk_tooltips_get_info_from_tip_window (GtkWindow    *tip_window,
 
   return has_tips;
 }
+
+#define __GTK_TOOLTIPS_C__
+#include "gtkaliasdef.c"
index c0ad3b1aa22f34cc48809d66519beb0ead233245..75692cb5d01bb6fde5455d250ee74d62a4ce00d6 100644 (file)
 #include <gtk/gtkwindow.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TOOLTIPS                  (gtk_tooltips_get_type ())
 #define GTK_TOOLTIPS(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLTIPS, GtkTooltips))
@@ -107,9 +104,6 @@ gboolean         gtk_tooltips_get_info_from_tip_window (GtkWindow    *tip_window
                                                         GtkTooltips **tooltips,
                                                         GtkWidget   **current_widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TOOLTIPS_H__ */
index 3864d19fca37352e2205a519f780838da2376df4..55bbce15ef18af8b791aa0cf961a4487aa1bde8a 100644 (file)
@@ -27,7 +27,6 @@
 #undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtksignal.h"
@@ -36,6 +35,7 @@
 #define GTK_ENABLE_BROKEN
 #include "gtktree.h"
 #include "gtktreeitem.h"
+#include "gtkalias.h"
 
 enum {
   SELECTION_CHANGED,
@@ -1129,3 +1129,6 @@ gtk_tree_set_view_lines (GtkTree       *tree,
   
   tree->view_line = flag;
 }
+
+#define __GTK_TREE_C__
+#include "gtkaliasdef.c"
index 7aadb318279e7b766ac985539c2eff7d9f7bfa6c..7e9da0eb59c2b2dba6c3f52c25a826c8d3ea5cd5 100644 (file)
 #include <gtk/gtkcontainer.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TREE                  (gtk_tree_get_type ())
 #define GTK_TREE(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE, GtkTree))
@@ -128,10 +125,7 @@ void       gtk_tree_remove_item        (GtkTree          *tree,
                                        GtkWidget        *child);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TREE_H__ */
 
index 5f9629487e1a0a070302772d63210ede0420ac5e..a70a53d8205858a459b94d996d06de3435fc80ab 100644 (file)
@@ -21,8 +21,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktreedatalist.h"
+#include "gtkalias.h"
 #include <string.h>
 static GMemChunk *tree_chunk = NULL;
 #define TREE_CHUNK_PREALLOCS 64
index 95356c72c739f35955bfea4021451dc87f0e9903..f6f5380a284fd83535fe1b88feff80a635d0dfe5 100644 (file)
@@ -19,8 +19,8 @@
 
 #include <config.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtktreednd.h"
+#include "gtkalias.h"
 
 GType
 gtk_tree_drag_source_get_type (void)
@@ -328,3 +328,6 @@ gtk_tree_get_row_drag_data (GtkSelectionData  *selection_data,
   
   return TRUE;
 }
+
+#define __GTK_TREE_DND_C__
+#include "gtkaliasdef.c"
index b04edc338753508c3e7a42e69086be93dd89a8cf..2c37be54c02b2ea7d4ee57aaca32538b8524da01 100644 (file)
@@ -27,7 +27,6 @@
 #undef GTK_DISABLE_DEPRECATED
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtklabel.h"
 #include "gtkeventbox.h"
 #include "gtkpixmap.h"
@@ -37,6 +36,7 @@
 #define GTK_ENABLE_BROKEN
 #include "gtktree.h"
 #include "gtktreeitem.h"
+#include "gtkalias.h"
 
 #include "tree_plus.xpm"
 #include "tree_minus.xpm"
@@ -1040,3 +1040,6 @@ gtk_tree_item_forall (GtkContainer *container,
   if (include_internals && tree_item->pixmaps_box)
     (* callback) (tree_item->pixmaps_box, callback_data);
 }
+
+#define __GTK_TREE_ITEM_C__
+#include "gtkaliasdef.c"
index beca5321e5303ff2d3e0753082877c6e69456324..0fef9e21e8fccbc6cc197edb046579f9c4cd38d5 100644 (file)
 #include <gtk/gtkitem.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TREE_ITEM              (gtk_tree_item_get_type ())
 #define GTK_TREE_ITEM(obj)              (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItem))
@@ -87,10 +84,7 @@ void       gtk_tree_item_expand         (GtkTreeItem *tree_item);
 void       gtk_tree_item_collapse       (GtkTreeItem *tree_item);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TREE_ITEM_H__ */
 
index 033c5cfc46344d0e50dfa1631f6183d69ea70f33..f33b3396fc16e18e09e8bc0e02066a2e6690cc99 100644 (file)
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <gobject/gvaluecollector.h>
-#include "gtkalias.h"
 #include "gtktreemodel.h"
 #include "gtktreeview.h"
 #include "gtktreeprivate.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 
 #define INITIALIZE_TREE_ITER(Iter) \
@@ -2022,3 +2022,6 @@ gtk_tree_row_reference_reordered (GObject     *proxy,
 
   gtk_tree_row_ref_reordered ((RowRefList *)g_object_get_data (proxy, ROW_REF_DATA_STRING), path, iter, new_order);
 }
+
+#define __GTK_TREE_MODEL_C__
+#include "gtkaliasdef.c"
index 3eb71d5ed2a2f1ccee7fb0ff8c80c16de50646dc..4a2a1645d6809731cf5ff7da293b53d668bb55e3 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktreemodelfilter.h"
 #include "gtkintl.h"
 #include "gtktreednd.h"
+#include "gtkalias.h"
 #include <string.h>
 
 /* ITER FORMAT:
@@ -2875,3 +2875,6 @@ gtk_tree_model_filter_clear_cache (GtkTreeModelFilter *filter)
     gtk_tree_model_filter_clear_cache_helper (filter,
                                               FILTER_LEVEL (filter->priv->root));
 }
+
+#define __GTK_TREE_MODEL_FILTER_C__
+#include "gtkaliasdef.c"
index 61cb405f498cb82530480efd444c73e3b73bc747..8376369c5eb7ef7cfbd4efdaa5aed4284737f6d5 100644 (file)
 #include <config.h>
 #include <string.h>
 
-#include "gtkalias.h"
 #include "gtktreemodelsort.h"
 #include "gtktreesortable.h"
 #include "gtktreestore.h"
 #include "gtktreedatalist.h"
 #include "gtkintl.h"
 #include "gtktreednd.h"
+#include "gtkalias.h"
 
 typedef struct _SortElt SortElt;
 typedef struct _SortLevel SortLevel;
@@ -100,7 +100,7 @@ enum {
 #define SORT_ELT(sort_elt) ((SortElt *)sort_elt)
 #define SORT_LEVEL(sort_level) ((SortLevel *)sort_level)
 
-#define GET_CHILD_ITER(tree_model_sort,child_iter,sort_iter) gtk_tree_model_sort_convert_iter_to_child_iter(GTK_TREE_MODEL_SORT (tree_model_sort), child_iter, sort_iter);
+#define GET_CHILD_ITER(tree_model_sort,ch_iter,so_iter) gtk_tree_model_sort_convert_iter_to_child_iter(GTK_TREE_MODEL_SORT (tree_model_sort), ch_iter, so_iter);
 
 #define NO_SORT_FUNC ((GtkTreeIterCompareFunc) 0x1)
 
@@ -2502,3 +2502,6 @@ gtk_tree_model_sort_iter_is_valid (GtkTreeModelSort *tree_model_sort,
   return gtk_tree_model_sort_iter_is_valid_helper (iter,
                                                   tree_model_sort->root);
 }
+
+#define __GTK_TREE_MODEL_SORT_C__
+#include "gtkaliasdef.c"
index 3e648fc51c34e5873dba19080a7c6fae785d30b1..3b9d686e471ea849b226d1dd49c35cd12689c217 100644 (file)
 
 #include <config.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtktreeselection.h"
 #include "gtktreeprivate.h"
 #include "gtkrbtree.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 static void gtk_tree_selection_init              (GtkTreeSelection      *selection);
 static void gtk_tree_selection_class_init        (GtkTreeSelectionClass *class);
@@ -1543,3 +1543,6 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
 
   return FALSE;
 }
+
+#define __GTK_TREE_SELECTION_C__
+#include "gtkaliasdef.c"
index 8b0f5d6ac6aebe7a3834be6bb79570446b96ddfc..9d258793520dad7a8958512d9e44e3ec244d63bf 100644 (file)
@@ -19,9 +19,9 @@
 
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtktreesortable.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 static void gtk_tree_sortable_base_init (gpointer g_class);
 
@@ -237,3 +237,6 @@ gtk_tree_sortable_has_default_sort_func (GtkTreeSortable *sortable)
   
   return (* iface->has_default_sort_func) (sortable);
 }
+
+#define __GTK_TREE_SORTABLE_C__
+#include "gtkaliasdef.c"
index 642b74c728f3e4822ab2ca05faf30ef9dc0147f9..ed247bc767fe89aebbd45c0530f474b482e22f99 100644 (file)
 #include <config.h>
 #include <string.h>
 #include <gobject/gvaluecollector.h>
-#include "gtkalias.h"
 #include "gtktreemodel.h"
 #include "gtktreestore.h"
 #include "gtktreedatalist.h"
 #include "gtktreednd.h"
+#include "gtkalias.h"
 
 #define G_NODE(node) ((GNode *)node)
 #define GTK_TREE_STORE_IS_SORTED(tree) (GTK_TREE_STORE (tree)->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
@@ -2985,3 +2985,6 @@ validate_gnode (GNode* node)
       iter = iter->next;
     }
 }
+
+#define __GTK_TREE_STORE_C__
+#include "gtkaliasdef.c"
index a81e9e9193c76e469b44653805ac4e679e757d73..28fde73a873a4fc5a987c99d598cecb8465d268b 100644 (file)
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "gtkalias.h"
 #include "gtktreeview.h"
 #include "gtkrbtree.h"
 #include "gtktreednd.h"
@@ -42,6 +41,7 @@
 #include "gtkentry.h"
 #include "gtkframe.h"
 #include "gtktreemodelsort.h"
+#include "gtkalias.h"
 
 #define GTK_TREE_VIEW_PRIORITY_VALIDATE (GDK_PRIORITY_REDRAW + 5)
 #define GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC (GTK_TREE_VIEW_PRIORITY_VALIDATE + 2)
@@ -13062,3 +13062,5 @@ gtk_tree_view_grab_notify (GtkWidget *widget,
     tree_view->priv->pressed_button = -1;
 }
 
+#define __GTK_TREE_VIEW_C__
+#include "gtkaliasdef.c"
index f0e726d9a2d4b4c710650441622cd1825ae2c253..63e80cc5854cc86d5deaf41c3864b3d3c0e22b28 100644 (file)
@@ -19,7 +19,6 @@
 
 #include <config.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtktreeviewcolumn.h"
 #include "gtktreeview.h"
 #include "gtktreeprivate.h"
@@ -31,6 +30,7 @@
 #include "gtkmarshalers.h"
 #include "gtkarrow.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 enum
 {
@@ -3660,3 +3660,5 @@ gtk_tree_view_column_cell_get_position (GtkTreeViewColumn *tree_column,
   return found_cell;
 }
 
+#define __GTK_TREE_VIEW_COLUMN_C__
+#include "gtkaliasdef.c"
index 7f2822ed2367f9039f639d27ef930dbf6f5dab87..5937cd47e85869a680ba0bf524c219bb73bfb4d1 100644 (file)
@@ -29,9 +29,9 @@
 #include <config.h>
 #include <string.h> /* strcmp */
 
-#include "gtkalias.h"
 #include "gtktypeutils.h"
 #include "gtkobject.h"
+#include "gtkalias.h"
 
 
 /* --- functions --- */
@@ -198,3 +198,6 @@ gtk_type_flags_find_value (GtkType      flags_type,
   return value;
 }
 
+
+#define __GTK_TYPE_UTILS_C__
+#include "gtkaliasdef.c"
index 16c2b318162f3194c84cf4e42f5254cf1ab791fe..8fa029353a7b35bf1e405c2e5736a99a81adc32c 100644 (file)
@@ -31,7 +31,6 @@
 #include <config.h>
 
 #include <string.h>
-#include "gtkalias.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkmenu.h"
@@ -42,6 +41,7 @@
 #include "gtktearoffmenuitem.h"
 #include "gtktoolbar.h"
 #include "gtkuimanager.h"
+#include "gtkalias.h"
 
 #undef DEBUG_UI_MANAGER
 
@@ -2799,3 +2799,6 @@ gtk_ui_manager_add_ui_from_file (GtkUIManager *self,
 }
 
 #endif
+
+#define __GTK_UI_MANAGER_C__
+#include "gtkaliasdef.c"
index ee54fec2c0047a654fa8f6bf2554b1af1a7cd5cb..3fc0a444e09f448e3268eb4dd0ea72aa83891a22 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkvbbox.h"
+#include "gtkalias.h"
 
 
 static void gtk_vbutton_box_class_init    (GtkVButtonBoxClass   *klass);
@@ -306,4 +306,5 @@ gtk_vbutton_box_size_allocate (GtkWidget     *widget,
     }
 }
   
-  
+#define __GTK_VBBOX_C__  
+#include "gtkaliasdef.c"
index ecea06e3755bcda13c5ade6b575acb5c73e8ec81..705e217b9e8063e0a0e38ece2404a3039307dc91 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkvbox.h"
+#include "gtkalias.h"
 
 
 static void gtk_vbox_class_init    (GtkVBoxClass   *klass);
@@ -321,3 +321,6 @@ gtk_vbox_size_allocate (GtkWidget     *widget,
        }
     }
 }
+
+#define __GTK_VBOX_C__
+#include "gtkaliasdef.c"
index 73cdf9fbbc564f5def284cb08f6b11bbc2f21eb5..22b2ab35ff032199518339c3a384bf0c930e2e6d 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkviewport.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkalias.h"
 
 enum {
   PROP_0,
@@ -882,3 +882,6 @@ gtk_viewport_style_set (GtkWidget *widget,
        gtk_style_set_background (widget->style, widget->window, widget->state);
      }
 }
+
+#define __GTK_VIEWPORT_C__
+#include "gtkaliasdef.c"
index 1ac7e5db722827a08d1965ce8ac9d4bab0e5f8eb..d0472a6397cd8873c2ac63cc5434d1c868f90a34 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkvpaned.h"
+#include "gtkalias.h"
 
 static void     gtk_vpaned_class_init     (GtkVPanedClass *klass);
 static void     gtk_vpaned_init           (GtkVPaned      *vpaned);
@@ -231,3 +231,6 @@ gtk_vpaned_size_allocate (GtkWidget     *widget,
        gtk_widget_size_allocate (paned->child2, &child_allocation);
     }
 }
+
+#define __GTK_VPANED_C__
+#include "gtkaliasdef.c"
index f967df5b4067b6c8cbca3d24c63335e9a2e51e6c..648ec961430fe2db28411a497ec14658f9a1c43b 100644 (file)
@@ -27,8 +27,8 @@
 #include <config.h>
 #include <math.h>
 #include <string.h>
-#include "gtkalias.h"
 #include "gtkvruler.h"
+#include "gtkalias.h"
 
 #include <glib/gprintf.h>
 
@@ -333,3 +333,6 @@ gtk_vruler_draw_pos (GtkRuler *ruler)
        }
     }
 }
+
+#define __GTK_VRULER_C__
+#include "gtkaliasdef.c"
index 2efa586d0953f52ff079dd21ecf8f9c1e85a39e0..cf431706998319656d444d3d73ce3c5a9ad08909 100644 (file)
@@ -28,9 +28,9 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "gtkalias.h"
 #include "gtkvscale.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 #define VALUE_SPACING 2
 
@@ -259,3 +259,5 @@ gtk_vscale_get_layout_offsets (GtkScale *scale,
   *y += widget->allocation.y;
 }
 
+#define __GTK_VSCALE_C__
+#include "gtkaliasdef.c"
index c8bfc3246654567dd86cff808b94b0af8a57a22f..714add7a80e8afee11752a7be64b5a9b0a5e3c8e 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkvscrollbar.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 static void     gtk_vscrollbar_class_init       (GtkVScrollbarClass *klass);
 static void     gtk_vscrollbar_init             (GtkVScrollbar      *vscrollbar);
@@ -89,3 +89,6 @@ gtk_vscrollbar_new (GtkAdjustment *adjustment)
   
   return vscrollbar;
 }
+
+#define __GTK_VSCROLLBAR_C__
+#include "gtkaliasdef.c"
index 27ced34a800b117b902f9345e089b71e177d0e8f..15798991d78f4d997650eb104de3b2b0946b35d8 100644 (file)
@@ -25,8 +25,8 @@
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkvseparator.h"
+#include "gtkalias.h"
 
 
 static void gtk_vseparator_class_init (GtkVSeparatorClass *klass);
@@ -101,3 +101,6 @@ gtk_vseparator_expose (GtkWidget      *widget,
 
   return FALSE;
 }
+
+#define __GTK_VSEPARATOR_C__
+#include "gtkaliasdef.c"
index 516c8694832ea7ac054f73987db31d4efe210010..e7b528cbbd97cefe207d4e31760d6b938e6f3185 100644 (file)
@@ -28,7 +28,6 @@
 #include <stdarg.h>
 #include <string.h>
 #include <locale.h>
-#include "gtkalias.h"
 #include "gtkcontainer.h"
 #include "gtkaccelmap.h"
 #include "gtkclipboard.h"
@@ -53,6 +52,7 @@
 #include "gtkaccessible.h"
 #include "gtktooltips.h"
 #include "gtkinvisible.h"
+#include "gtkalias.h"
 
 #define WIDGET_CLASS(w)         GTK_WIDGET_GET_CLASS (w)
 #define        INIT_PATH_SIZE  (512)
@@ -1901,7 +1901,12 @@ gtk_widget_unparent (GtkWidget *widget)
   if (GTK_WIDGET_REALIZED (widget)) 
     {
       if (GTK_WIDGET_IN_REPARENT (widget))
-       gtk_widget_unmap (widget);
+#if 1
+       {
+         g_print ("unmapping!\n");
+         gtk_widget_unmap (widget);
+       }
+#endif
       else
        gtk_widget_unrealize (widget);
     }
@@ -3735,7 +3740,9 @@ gtk_widget_reparent_subwindows (GtkWidget *widget,
 
      parent = gdk_window_get_parent (widget->window);
 
-     if (parent)
+     if (parent == NULL)
+       gdk_window_reparent (widget->window, new_window, 0, 0);
+     else
        {
         children = gdk_window_get_children (parent);
         
@@ -7602,3 +7609,6 @@ gtk_widget_set_no_show_all (GtkWidget *widget,
   
   g_object_notify (G_OBJECT (widget), "no_show_all");
 }
+
+#define __GTK_WIDGET_C__
+#include "gtkaliasdef.c"
index 6a44a26727d0333da31915c628beabf0937f6677..60ef4b3278f9be6dfb91aee5a9b89e5ac89a3b80 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkprivate.h"
 #include "gtkwindow.h"
 #include "gtkmain.h"
+#include "gtkwindow-decorate.h"
+#include "gtkalias.h"
 
 
 #ifdef GDK_WINDOWING_FB
@@ -830,4 +831,5 @@ gtk_decorated_window_move_resize_window (GtkWindow   *window,
 #endif
 
 
-
+#define __GTK_WINDOW_DECORATE_C__
+#include "gtkaliasdef.c"
index 2ce21b3140e9d06bc3343446e439d84f2fdda203..9f182f457b9975564da0172dd7afaa976c5b17bc 100644 (file)
@@ -21,6 +21,9 @@
  * Authors: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __GTK_WINDOW_DECORATE_H__
+#define __GTK_WINDOW_DECORATE_H__
+
 G_BEGIN_DECLS
 
 void gtk_decorated_window_init                 (GtkWindow   *window);
@@ -34,3 +37,5 @@ void gtk_decorated_window_move_resize_window   (GtkWindow   *window,
                                                gint         height);
 
 G_END_DECLS
+
+#endif /* __GTK_WINDOW_DECORATE_H__ */
index 2001d6f7468c26d4634213c249d2da7ea33638e2..1434ccc06c249186d02361927a95051dcb5c9362 100644 (file)
@@ -30,7 +30,6 @@
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
 
-#include "gtkalias.h"
 #include "gtkprivate.h"
 #include "gtkrc.h"
 #include "gtkwindow.h"
@@ -44,6 +43,7 @@
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkplug.h"
+#include "gtkalias.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
@@ -7506,3 +7506,6 @@ gtk_window_set_default_icon_from_file (const gchar *filename,
 }
 
 #endif
+
+#define __GTK_WINDOW_C__
+#include "gtkaliasdef.c"
index 54d1388bde56417683688d778fd6e341b76f0417..177290f2161a2008f3e1ec2c9bbe5b0ec77a0650 100644 (file)
 #include <gtk/gtkenums.h>
 #include <gtk/gtkwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_WINDOW                        (gtk_window_get_type ())
 #define GTK_WINDOW(obj)                        (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow))
@@ -413,9 +410,6 @@ gboolean    _gtk_window_query_nonaccels     (GtkWindow      *window,
                                                 guint           accel_key,
                                                 GdkModifierType accel_mods);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_WINDOW_H__ */
index 9246b3a81e671c3767d53f0ebf6ccf5735cc378e..4d084f1401ed5a4e6df2021faf38d5dec5ddd421 100644 (file)
  */
 
 #include <config.h>
-#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gtkxembed.h"
+#include "gtkalias.h"
 
 typedef struct _GtkXEmbedMessage GtkXEmbedMessage;
 
index b1b76d9560b2d8d7fc3b1845293a270bac36e22b..3011a577cc0bffb8bafc305d422440cfa07911b4 100755 (executable)
@@ -1,5 +1,12 @@
 #!/usr/bin/perl -w
 
+my $do_def = 0;
+
+if (($#ARGV >= 0) && ($ARGV[0] eq "-def")) {
+    shift;
+    $do_def = 1;
+}
+
 print <<EOF;
 /* Generated by makegtkalias.pl */
 
@@ -9,45 +16,30 @@ print <<EOF;
 
 #ifdef G_HAVE_GNUC_VISIBILITY
 
-#ifdef  GTK_ENABLE_BROKEN
-#define WAS_BROKEN
-#endif
-#define GTK_ENABLE_BROKEN
-
-#ifdef GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-#define WAS_UNSUPPORTED_TEXT_API
+#ifndef GTK_DISABLE_DEPRECATED
+#define GTK_DISABLE_DEPRECATED
+#define REENABLE_DEPRECATED
 #endif
-#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 
-#ifdef  GTK_DISABLE_DEPRECATED
-#define WAS_NO_DEPR
-#endif
-#undef  GTK_DISABLE_DEPRECATED
+EOF
 
-#ifdef  G_DISABLE_DEPRECATED
-#define WAS_NO_G_DEPR
-#endif
-#undef  G_DISABLE_DEPRECATED
+if ($do_def) {
+    print <<EOF
+#undef IN_FILE
+#define IN_FILE defined
 
-#include "gtk.h"
+#undef IN_HEADER
+#define IN_HEADER(x) 1
 
-#include "gtkfilesystem.h"
-#ifdef G_OS_UNIX
-#include "gtkfilesystemunix.h"
-#endif
-#ifdef G_OS_WIN32
-#include "gtkfilesystemwin32.h"
-#endif
-#include "gtkhsv.h"
-#include "gtkpathbar.h"
-#include "gtktextdisplay.h"
-#include "gtktextlayout.h"
-#include "gtktextsegment.h"
-#include "gtktexttypes.h"
-#include "gtkthemes.h"
-#include "gtkwindow-decorate.h"
+EOF
+} 
+else { 
+    print <<EOF
+#define IN_FILE(x) 1
+#define IN_HEADER defined
 
 EOF
+}
 
 my $in_comment = 0;
 my $in_skipped_section = 0;
@@ -86,7 +78,7 @@ while (<>) {
       next;
   }
 
-  if ($_ =~ /^\#ifdef\s+INCLUDE_VARIABLES/)
+  if ($_ =~ /^\#ifdef\s+(INCLUDE_VARIABLES|ALL_FILES)/)
   {
       $in_skipped_section = 1;
   }
@@ -96,13 +88,20 @@ while (<>) {
       next;
   }
 
-  if ($_ =~ /^\#ifdef\s+G/)
+  if ($_ =~ /^\#ifn?def\s+G/)
   {
       print $_;
       
       next;
   }
  
+  if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/)
+  {
+      print $_;
+      
+      next;
+  }
+
   chop;
   my $str = $_;
   my @words;
@@ -118,40 +117,28 @@ while (<>) {
       $attributes = "$attributes $word" unless $word eq "PRIVATE";
   }
       
-  print <<EOF
+  if (!$do_def) {
+    print <<EOF
 extern __typeof ($str) $alias __attribute((visibility("hidden")))$attributes;
-extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
 \#define $str $alias
 
 EOF
+  }
+  else {
+    print <<EOF
+\#undef $str 
+extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
+
+EOF
+  }
 }
 
 print <<EOF;
-
-#ifndef WAS_BROKEN
-#undef  GTK_ENABLE_BROKEN
-#else
-#undef  WAS_BROKEN
-#endif
-
-#ifndef WAS_UNSUPPORTED_TEXT_API
-#undef GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-#else
-#undef WAS_UNSUPPORTED_TEXT_API
-#endif
-
-#ifdef  WAS_NO_DEPR
-#define GTK_DISABLE_DEPRECATED
-#undef  WAS_NO_DEPR
-#endif
-
-#ifdef  WAS_NO_G_DEPR
-#define G_DISABLE_DEPRECATED
-#undef  WAS_NO_G_DEPR
+#ifdef REENABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
 #endif
 
 #endif /* G_HAVE_GNUC_VISIBILITY */
-
 #endif /* DISABLE_VISIBILITY */
 EOF